Lillian-Violet/NixOS-Config
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: Lillian-Violet:main
Branches Tags
Lillian-Violet:main
Lillian-Violet:stylix-fixed
Lillian-Violet:Desktop-changes
Lillian-Violet:bcachefs-update-broken-queen
Lillian-Violet:fcast
Lillian-Violet:2.0
Lillian-Violet:v1.0
..
compare: Lillian-Violet:stylix-fixed
Branches Tags
Lillian-Violet:main
Lillian-Violet:stylix-fixed
Lillian-Violet:Desktop-changes
Lillian-Violet:bcachefs-update-broken-queen
Lillian-Violet:fcast
Lillian-Violet:2.0
Lillian-Violet:v1.0

1 commit
main ... stylix-fix

Author SHA1 Message Date
Lillian Violet e4839e4d2e all the work to make stylix work again, just need to update the flake lock when it's time 2025-04-01 17:26:15 +02:00
11 changed files with 167 additions and 194 deletions
Show stats Expand all files Collapse all files

108
flake.lock
View file

@ -74,7 +74,6 @@
"flake-parts": [
"flake-parts"
],
"nix-github-actions": "nix-github-actions",
"nixpkgs": [
"nixpkgs"
],
@ -82,11 +81,11 @@
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1743460818,
"narHash": "sha256-NmpDlQORTW1T2xot97mim7+4CQySFMMoWF10Ix8CXcY=",
"lastModified": 1742852783,
"narHash": "sha256-pgpFoMc1RGGSyOGJikcXzsQND7VQ1/ywTwFa537b/hQ=",
"owner": "koverstreet",
"repo": "bcachefs-tools",
"rev": "3aa2a4c47ce57ff3965b75df9dde1a7b40ed6ae1",
"rev": "6657ce2de3cdb25b14fb0183b90366e3e577fb9a",
"type": "github"
},
"original": {
@ -116,11 +115,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1743414153,
"narHash": "sha256-bFIXz7SvLlSNR4M3vYPYS1CpEN9vTUiH01R4iR/BDmA=",
"lastModified": 1742599566,
"narHash": "sha256-xr6ntmiUPXSh9o9mJ7og9vxALMQs1EQhIhWUAO2D1M0=",
"owner": "catppuccin",
"repo": "nix",
"rev": "2f52f9ead26f80d7b391cedcbb3eb309bd83fff4",
"rev": "5e303e8d7e251868fa79f83bbda69da90aa62402",
"type": "github"
},
"original": {
@ -503,11 +502,11 @@
]
},
"locked": {
"lastModified": 1743519130,
"narHash": "sha256-Nw6sLnuwDPW7pBJ5jIvFFMqBfeK31xcp7/w1oYH1Q7U=",
"lastModified": 1742851132,
"narHash": "sha256-8vEcDefstheV1whup+5fSpZu4g9Jr7WpYzOBKAMSHn4=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "0afad8f08014c992c832466c1d46a0aa96ca2563",
"rev": "c4d5d72805d14ea43c140eeb70401bf84c0f11b4",
"type": "github"
},
"original": {
@ -540,15 +539,15 @@
},
"jovian": {
"inputs": {
"nix-github-actions": "nix-github-actions_2",
"nix-github-actions": "nix-github-actions",
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1743144043,
"narHash": "sha256-QlEk4Xm5KG0jW5Kus9teY3bhxdf0GUTexxTUCaJM5ms=",
"lastModified": 1742465245,
"narHash": "sha256-gpjtkoeq5Ye9J8GoR+rWg3NL4bbEtcLvvF4nN6MtxdU=",
"owner": "Jovian-Experiments",
"repo": "Jovian-NixOS",
"rev": "1c17514c8558886af0afc34b6c348c1f2ee9fd24",
"rev": "a95606cae5c9e1f5b84debe7865ef171d4deb287",
"type": "github"
},
"original": {
@ -581,27 +580,6 @@
}
},
"nix-github-actions": {
"inputs": {
"nixpkgs": [
"bcachefs-tools",
"nixpkgs"
]
},
"locked": {
"lastModified": 1737420293,
"narHash": "sha256-F1G5ifvqTpJq7fdkT34e/Jy9VCyzd5XfJ9TO8fHhJWE=",
"owner": "nix-community",
"repo": "nix-github-actions",
"rev": "f4158fa080ef4503c8f4c820967d946c2af31ec9",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nix-github-actions",
"type": "github"
}
},
"nix-github-actions_2": {
"inputs": {
"nixpkgs": [
"jovian",
@ -630,11 +608,11 @@
]
},
"locked": {
"lastModified": 1743306489,
"narHash": "sha256-LROaIjSLo347cwcHRfSpqzEOa2FoLSeJwU4dOrGm55E=",
"lastModified": 1742701275,
"narHash": "sha256-AulwPVrS9859t+eJ61v24wH/nfBEIDSXYxlRo3fL/SA=",
"owner": "nix-community",
"repo": "nix-index-database",
"rev": "b3696bfb6c24aa61428839a99e8b40c53ac3a82d",
"rev": "36dc43cb50d5d20f90a28d53abb33a32b0a2aae6",
"type": "github"
},
"original": {
@ -681,11 +659,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1743420942,
"narHash": "sha256-b/exDDQSLmENZZgbAEI3qi9yHkuXAXCPbormD8CSJXo=",
"lastModified": 1742806253,
"narHash": "sha256-zvQ4GsCJT6MTOzPKLmlFyM+lxo0JGQ0cSFaZSACmWfY=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "de6fc5551121c59c01e2a3d45b277a6d05077bc4",
"rev": "ecaa2d911e77c265c2a5bac8b583c40b0f151726",
"type": "github"
},
"original": {
@ -697,11 +675,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1742889210,
"narHash": "sha256-hw63HnwnqU3ZQfsMclLhMvOezpM7RSB0dMAtD5/sOiw=",
"lastModified": 1742288794,
"narHash": "sha256-Txwa5uO+qpQXrNG4eumPSD+hHzzYi/CdaM80M9XRLCo=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "698214a32beb4f4c8e3942372c694f40848b360d",
"rev": "b6eaf97c6960d97350c584de1b6dcff03c9daf42",
"type": "github"
},
"original": {
@ -728,11 +706,11 @@
},
"nixpkgs-edge": {
"locked": {
"lastModified": 1743520842,
"narHash": "sha256-5lWR/Ku1xrwDGacNRyCUrCYr66AdR6BntH6vfHUpZns=",
"lastModified": 1742855907,
"narHash": "sha256-7njF0f8vk19p0cCYP+9EgYWT2RPCTSD822Yi41THKcs=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "963f97c0792f299d42f6ff9245618383bbce825e",
"rev": "d395b30f4825e4bfbc31ed2fbd06162da496217e",
"type": "github"
},
"original": {
@ -743,11 +721,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1743315132,
"narHash": "sha256-6hl6L/tRnwubHcA4pfUUtk542wn2Om+D4UnDhlDW9BE=",
"lastModified": 1742669843,
"narHash": "sha256-G5n+FOXLXcRx+3hCJ6Rt6ZQyF1zqQ0DL0sWAMn2Nk0w=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "52faf482a3889b7619003c0daec593a1912fddc1",
"rev": "1e5b653dff12029333a6546c11e108ede13052eb",
"type": "github"
},
"original": {
@ -791,11 +769,11 @@
},
"nixpkgs_4": {
"locked": {
"lastModified": 1743315132,
"narHash": "sha256-6hl6L/tRnwubHcA4pfUUtk542wn2Om+D4UnDhlDW9BE=",
"lastModified": 1742669843,
"narHash": "sha256-G5n+FOXLXcRx+3hCJ6Rt6ZQyF1zqQ0DL0sWAMn2Nk0w=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "52faf482a3889b7619003c0daec593a1912fddc1",
"rev": "1e5b653dff12029333a6546c11e108ede13052eb",
"type": "github"
},
"original": {
@ -822,11 +800,11 @@
},
"nixpkgs_6": {
"locked": {
"lastModified": 1743441817,
"narHash": "sha256-+OE03P3u0FRwhS+Ah6EYiwxdS1rcIYlXheuXGM3wP3Q=",
"lastModified": 1742578646,
"narHash": "sha256-GiQ40ndXRnmmbDZvuv762vS+gew1uDpFwOfgJ8tLiEs=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "3eeaa42ef4c19447b48d1c676fe59077dfd0846e",
"rev": "94c4dbe77c0740ebba36c173672ca15a7926c993",
"type": "github"
},
"original": {
@ -1053,11 +1031,11 @@
"nixpkgs": "nixpkgs_6"
},
"locked": {
"lastModified": 1743502316,
"narHash": "sha256-zI2WSkU+ei4zCxT+IVSQjNM9i0ST++T2qSFXTsAND7s=",
"lastModified": 1742700801,
"narHash": "sha256-ZGlpUDsuBdeZeTNgoMv+aw0ByXT2J3wkYw9kJwkAS4M=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "e7f4d7ed8bce8dfa7d2f2fe6f8b8f523e54646f8",
"rev": "67566fe68a8bed2a7b1175fdfb0697ed22ae8852",
"type": "github"
},
"original": {
@ -1088,11 +1066,11 @@
"tinted-zed": "tinted-zed"
},
"locked": {
"lastModified": 1743496321,
"narHash": "sha256-xhHg8ixBhZngvGOMb2SJuJEHhHA10n8pA02fEKuKzek=",
"lastModified": 1742855382,
"narHash": "sha256-C/aBeGktWiRg2EoSc0Aug8v+cZirSkyoVtMx1P0Dex0=",
"owner": "danth",
"repo": "stylix",
"rev": "54721996d6590267d095f63297d9051e9342a33d",
"rev": "5321ab0c763caa786c9756a8e8e85d1c35a8e650",
"type": "github"
},
"original": {
@ -1279,11 +1257,11 @@
"rust-overlay": "rust-overlay_3"
},
"locked": {
"lastModified": 1743151937,
"narHash": "sha256-SjfGN+3wrzgRvzpziowTQUIr/o6ac5iMniua0ra6elo=",
"lastModified": 1741803511,
"narHash": "sha256-DcCGBWvAvt+OWI+EcPRO+/IXZHkFgPxZUmxf2VLl8no=",
"owner": "dj95",
"repo": "zjstatus",
"rev": "2772e18d1bf57b5fe24c7e2c86a6cbec0475cd88",
"rev": "df9c77718f7023de8406e593eda6b5b0bc09cddd",
"type": "github"
},
"original": {

12
flake.nix
View file

@ -34,10 +34,10 @@
catppuccin.url = "github:catppuccin/nix";
# Conduit fork without all the fuss and drama
conduwuit = {
url = "github:girlbossceo/conduwuit";
inputs.nixpkgs.follows = "nixpkgs";
};
# conduwuit = {
# url = "github:girlbossceo/conduwuit";
# inputs.nixpkgs.follows = "nixpkgs";
# };
# Nix index database files
nix-index-database.url = "github:nix-community/nix-index-database";
@ -99,7 +99,7 @@
jovian,
nixos-hardware,
nix-index-database,
conduwuit,
# conduwuit,
stylix,
...
} @ inputs: let
@ -131,7 +131,7 @@
nix-index-database.nixosModules.nix-index
{
home-manager.sharedModules = [
catppuccin.homeModules.catppuccin
inputs.catppuccin.homeModules.catppuccin
./home-manager/shared
sops-nix.homeManagerModules.sops
];

1
home-manager/desktop/package-configs/foot/default.nix
View file

@ -4,6 +4,7 @@
# catppuccin.enable = true;
settings = {
main = {
font = "Atkinson Monolegible:size=12";
};
mouse = {

55
home-manager/desktop/package-configs/plasma-desktop.nix
View file

@ -13,33 +13,33 @@
programs.plasma = {
enable = true;
desktop.mouseActions.verticalScroll = "switchVirtualDesktop";
# kscreenlocker.appearance.wallpaper = "${osConfig.stylix.image}";
# fonts = {
# fixedWidth = {
# pointSize = 11;
# family = "${osConfig.stylix.fonts.monospace.name}";
# };
# general = {
# pointSize = 11;
# family = "${osConfig.stylix.fonts.serif.name}";
# };
# menu = {
# pointSize = 11;
# family = "${osConfig.stylix.fonts.sansSerif.name}";
# };
# small = {
# pointSize = 11;
# family = "${osConfig.stylix.fonts.sansSerif.name}";
# };
# toolbar = {
# pointSize = 11;
# family = "${osConfig.stylix.fonts.sansSerif.name}";
# };
# windowTitle = {
# pointSize = 11;
# family = "${osConfig.stylix.fonts.sansSerif.name}";
# };
# };
kscreenlocker.appearance.wallpaper = "${osConfig.stylix.image}";
fonts = {
fixedWidth = {
pointSize = 11;
family = "${osConfig.stylix.fonts.monospace.name}";
};
general = {
pointSize = 11;
family = "${osConfig.stylix.fonts.serif.name}";
};
menu = {
pointSize = 11;
family = "${osConfig.stylix.fonts.sansSerif.name}";
};
small = {
pointSize = 11;
family = "${osConfig.stylix.fonts.sansSerif.name}";
};
toolbar = {
pointSize = 11;
family = "${osConfig.stylix.fonts.sansSerif.name}";
};
windowTitle = {
pointSize = 11;
family = "${osConfig.stylix.fonts.sansSerif.name}";
};
};
panels = [
{
alignment = "left";
@ -82,6 +82,7 @@
"qBittorrent"
"vlc"
"steam"
"Thunderbird Daily"
];
};
}

59
home-manager/shared/default.nix
View file

@ -54,36 +54,33 @@
# };
};
};
# stylix.enable = true;
# qt.platformTheme.name = lib.mkForce "kvantum";
# qt.style.name = lib.mkForce "kvantum";
# stylix = {
# enable = true;
# autoEnable = true;
# base16Scheme = {
# scheme = "Catppuccin Macchiato";
# author = "https://github.com/catppuccin/catppuccin";
# base00 = "24273a";
# base01 = "1e2030";
# base02 = "363a4f";
# base03 = "494d64";
# base04 = "5b6078";
# base05 = "cad3f5";
# base06 = "f4dbd6";
# base07 = "b7bdf8";
# base08 = "ed8796";
# base09 = "f5a97f";
# base0A = "eed49f";
# base0B = "a6da95";
# base0C = "8bd5ca";
# base0D = "8aadf4";
# base0E = "c6a0f6";
# base0F = "f0c6c6";
# };
# image = ./background.jpg;
# cursor.package = pkgs.catppuccin-cursors;
# cursor.name = "catppuccin-macchiato-mauve-cursors";
# cursor.size = 16;
# };
stylix = {
enable = true;
autoEnable = true;
base16Scheme = {
scheme = "Catppuccin Macchiato";
author = "https://github.com/catppuccin/catppuccin";
base00 = "24273a";
base01 = "1e2030";
base02 = "363a4f";
base03 = "494d64";
base04 = "5b6078";
base05 = "cad3f5";
base06 = "f4dbd6";
base07 = "b7bdf8";
base08 = "ed8796";
base09 = "f5a97f";
base0A = "eed49f";
base0B = "a6da95";
base0C = "8bd5ca";
base0D = "8aadf4";
base0E = "c6a0f6";
base0F = "f0c6c6";
};
image = ./background.jpg;
cursor.package = pkgs.catppuccin-cursors;
cursor.name = "catppuccin-macchiato-mauve-cursors";
cursor.size = 16;
};
}

3
home-manager/shared/shell/helix/helix.nix
View file

@ -7,7 +7,7 @@
}:
rustPlatform.buildRustPackage rec {
pname = "helix";
version = "25.01.1";
version = "24.07";
# This release tarball includes source code for the tree-sitter grammars,
# which is not ordinarily part of the repository.
@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
stripRoot = false;
};
useFetchCargoVendor = true;
cargoHash = "";
nativeBuildInputs = [git installShellFiles];

2
nixos/desktop/package-configs/firefox/default.nix
View file

@ -160,8 +160,6 @@
"floorp.tabbar.style" = 2;
"floorp.browser.user.interface" = 8;
"signon.rememberSignons" = true;
"browser.ml.chat.enabled" = false;
"browser.ml.chat.shortcuts" = false;
};
# TODO: switch to ManagedBookmarks as this will be dropped at some point https://mozilla.github.io/policy-templates/#managedbookmarks
# Bookmarks = [

2
nixos/server/package-configs/nextcloud/default.nix
View file

@ -50,7 +50,7 @@
enable = true;
hostName = "nextcloud.gladtherescake.eu";
package = pkgs.nextcloud31;
package = pkgs.nextcloud30;
# Use HTTPS for links
https = true;

110
nixos/shared/default.nix
View file

@ -70,8 +70,8 @@
catppuccin = {
flavor = "macchiato";
tty.enable = true;
# sddm.enable = true;
# sddm.flavor = "macchiato";
sddm.enable = true;
sddm.flavor = "macchiato";
forgejo.enable = true;
forgejo.flavor = "macchiato";
# plymouth.enable = false;
@ -87,70 +87,70 @@
enableBrowserSocket = true;
};
# stylix = {
# enable = true;
# # targets.qt.platform = "kde6";
# autoEnable = true;
# base16Scheme = {
# scheme = "Catppuccin Macchiato";
# author = "https://github.com/catppuccin/catppuccin";
# base00 = "24273a";
# base01 = "1e2030";
# base02 = "363a4f";
# base03 = "494d64";
# base04 = "5b6078";
# base05 = "cad3f5";
# base06 = "f4dbd6";
# base07 = "b7bdf8";
# base08 = "ed8796";
# base09 = "f5a97f";
# base0A = "eed49f";
# base0B = "a6da95";
# base0C = "8bd5ca";
# base0D = "8aadf4";
# base0E = "c6a0f6";
# base0F = "f0c6c6";
# };
# image = ./background.jpg;
# cursor.package = pkgs.catppuccin-cursors.macchiatoMauve;
# cursor.name = "catppuccin-macchiato-mauve-cursors";
# cursor.size = 16;
# homeManagerIntegration.followSystem = true;
# fonts = {
# serif = {
# package = pkgs.dejavu_fonts;
# name = "DejaVu Serif";
# };
stylix = {
enable = true;
autoEnable = true;
base16Scheme = {
scheme = "Catppuccin Macchiato";
author = "https://github.com/catppuccin/catppuccin";
base00 = "24273a";
base01 = "1e2030";
base02 = "363a4f";
base03 = "494d64";
base04 = "5b6078";
base05 = "cad3f5";
base06 = "f4dbd6";
base07 = "b7bdf8";
base08 = "ed8796";
base09 = "f5a97f";
base0A = "eed49f";
base0B = "a6da95";
base0C = "8bd5ca";
base0D = "8aadf4";
base0E = "c6a0f6";
base0F = "f0c6c6";
};
image = ./background.jpg;
cursor.package = pkgs.catppuccin-cursors.macchiatoMauve;
cursor.name = "catppuccin-macchiato-mauve-cursors";
cursor.size = 16;
homeManagerIntegration.followSystem = true;
fonts = {
serif = {
package = pkgs.atkinson-hyperlegible;
name = "Atkinson Hyperlegible";
};
# monospace = {
# package = pkgs.dejavu_fonts;
# name = "DejaVu Sans Mono";
# };
monospace = {
package = pkgs.atkinson-monolegible;
name = "Atkinson Monolegible";
};
# sansSerif = {
# package = pkgs.dejavu_fonts;
# name = "DejaVu Sans";
# };
sansSerif = {
package = pkgs.atkinson-hyperlegible;
name = "Atkinson Hyperlegible";
};
# emoji = {
# package = pkgs.noto-fonts-emoji-blob-bin;
# name = "Blobmoji";
# };
# };
# };
emoji = {
package = pkgs.noto-fonts-emoji-blob-bin;
name = "Blobmoji";
};
};
};
fonts.packages = [
pkgs.atkinson-hyperlegible
pkgs.atkinson-monolegible
pkgs.noto-fonts-emoji-blob-bin
pkgs.noto-fonts
pkgs.nerd-fonts.fira-mono
];
fonts.fontconfig.defaultFonts = {
emoji = ["Blobmoji"];
monospace = ["Atkinson Monolegible"];
sansSerif = ["Atkinson Hyperlegible"];
};
# fonts.fontconfig.defaultFonts = {
# emoji = ["Blobmoji"];
# monospace = ["Atkinson Monolegible"];
# sansSerif = ["Atkinson Hyperlegible"];
# };
networking =
if config.services.vpn-ip.enable

2
nixos/shared/packages/default.nix
View file

@ -22,7 +22,7 @@
install-nix-no-inhibit
update
upgrade
simple-completion-language-server
# simple-completion-language-server
# System tools
age

7
pkgs/simple-completion-language-server/default.nix
View file

@ -5,17 +5,16 @@
}:
rustPlatform.buildRustPackage rec {
pname = "simple-completion-language-server";
version = "6c797949ad5a6e9548b60b5475d1c9977f26c811";
version = "ff9f90bc96c347f284571bc6310bc31f95508d55";
src = fetchFromGitHub {
owner = "estin";
repo = pname;
rev = version;
hash = "sha256-cITZdlDB03i7gOYbahV99wZOQ7tisnqdT/N2Z12oLFM=";
hash = "sha256-qybbZXjKzKcc6UXfAjwmkkB+qEUuGQXABRbMj7bNksM=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-nannF4BKRLCcsS7VznzEHqrhLHYvN4X22t8jud87XEM=";
cargoHash = "sha256-VTz2Fm+PRUPM5+u9D+2TzGGIEQwb1j0Lz0WRaQ5/Yzo=";
meta = with lib; {
description = "Language server to enable word completion and snippets for Helix editor";
homepage = "https://github.com/estin/simple-completion-language-server";