diff --git a/flake.lock b/flake.lock index adf45aad..dbe9541a 100644 --- a/flake.lock +++ b/flake.lock @@ -130,10 +130,7 @@ }, "crane": { "inputs": { - "nixpkgs": [ - "lanzaboote", - "nixpkgs" - ] + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1717535930, @@ -422,7 +419,7 @@ }, "flake-utils-plus": { "inputs": { - "flake-utils": "flake-utils_4" + "flake-utils": "flake-utils_5" }, "locked": { "lastModified": 1715533576, @@ -440,12 +437,15 @@ } }, "flake-utils_2": { + "inputs": { + "systems": "systems_2" + }, "locked": { - "lastModified": 1644229661, - "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -470,8 +470,23 @@ } }, "flake-utils_4": { + "locked": { + "lastModified": 1644229661, + "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_5": { "inputs": { - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1694529238, @@ -752,9 +767,6 @@ "flake-compat" ], "flake-parts": "flake-parts", - "flake-utils": [ - "utils" - ], "nixpkgs": [ "nixpkgs" ], @@ -762,16 +774,16 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1718178907, - "narHash": "sha256-eSZyrQ9uoPB9iPQ8Y5H7gAmAgAvCw3InStmU3oEjqsE=", + "lastModified": 1737639419, + "narHash": "sha256-AEEDktApTEZ5PZXNDkry2YV2k6t0dTgLPEmAZbnigXU=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "b627ccd97d0159214cee5c7db1412b75e4be6086", + "rev": "a65905a09e2c43ff63be8c0e86a93712361f871e", "type": "github" }, "original": { "owner": "nix-community", - "ref": "v0.4.1", + "ref": "v0.4.2", "repo": "lanzaboote", "type": "github" } @@ -837,10 +849,10 @@ }, "neorg-overlay": { "inputs": { - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_2", "neorg": "neorg", "neorg-telescope": "neorg-telescope", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "norg": "norg", "norg-meta": "norg-meta" }, @@ -1008,6 +1020,20 @@ "type": "github" } }, + "nixpkgs_10": { + "locked": { + "lastModified": 1724517639, + "narHash": "sha256-3eTrclsS5OYShbw0MRiiF3GJ8emUTwVzAZo96pdD7hM=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "9edd5ddbd2453e22d4c4820992563c7ba0930f7a", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1743583204, @@ -1042,11 +1068,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1743814133, - "narHash": "sha256-drDyYyUmjeYGiHmwB9eOPTQRjmrq3Yz26knwmMPLZFk=", + "lastModified": 1743938762, + "narHash": "sha256-UgFYn8sGv9B8PoFpUfCa43CjMZBl1x/ShQhRDHBFQdI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "250b695f41e0e2f5afbf15c6b12480de1fe0001b", + "rev": "74a40410369a1c35ee09b8a1abee6f4acbedc059", "type": "github" }, "original": { @@ -1058,11 +1084,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1644486793, - "narHash": "sha256-EeijR4guVHgVv+JpOX3cQO+1XdrkJfGmiJ9XVsVU530=", + "lastModified": 1743814133, + "narHash": "sha256-drDyYyUmjeYGiHmwB9eOPTQRjmrq3Yz26knwmMPLZFk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1882c6b7368fd284ad01b0a5b5601ef136321292", + "rev": "250b695f41e0e2f5afbf15c6b12480de1fe0001b", "type": "github" }, "original": { @@ -1090,16 +1116,16 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1743827369, - "narHash": "sha256-rpqepOZ8Eo1zg+KJeWoq1HAOgoMCDloqv5r2EAa9TSA=", - "owner": "nixos", + "lastModified": 1644486793, + "narHash": "sha256-EeijR4guVHgVv+JpOX3cQO+1XdrkJfGmiJ9XVsVU530=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "42a1c966be226125b48c384171c44c651c236c22", + "rev": "1882c6b7368fd284ad01b0a5b5601ef136321292", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-unstable", + "owner": "NixOS", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } @@ -1122,23 +1148,25 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1724517639, - "narHash": "sha256-3eTrclsS5OYShbw0MRiiF3GJ8emUTwVzAZo96pdD7hM=", - "owner": "NixOS", + "lastModified": 1743827369, + "narHash": "sha256-rpqepOZ8Eo1zg+KJeWoq1HAOgoMCDloqv5r2EAa9TSA=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "9edd5ddbd2453e22d4c4820992563c7ba0930f7a", + "rev": "42a1c966be226125b48c384171c44c651c236c22", "type": "github" }, "original": { - "id": "nixpkgs", - "type": "indirect" + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" } }, "norg": { "inputs": { "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_5" + "flake-utils": "flake-utils_3", + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1672582520, @@ -1158,8 +1186,8 @@ "norg-meta": { "inputs": { "flake-compat": "flake-compat_3", - "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_6" + "flake-utils": "flake-utils_4", + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1713028366, @@ -1178,7 +1206,7 @@ "nur": { "inputs": { "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_9", "treefmt-nix": "treefmt-nix" }, "locked": { @@ -1248,7 +1276,7 @@ "rbw-bitw": { "inputs": { "flakelib": "flakelib_2", - "nixpkgs": "nixpkgs_9", + "nixpkgs": "nixpkgs_10", "rust": "rust_2" }, "locked": { @@ -1288,7 +1316,7 @@ "neorg-overlay": "neorg-overlay", "nix-index-database": "nix-index-database", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_8", "nur": "nur", "plasma-manager": "plasma-manager", "rbw-bitw": "rbw-bitw", @@ -1297,7 +1325,7 @@ "sops-nix": "sops-nix", "spacebar": "spacebar", "std": "std_2", - "systems": "systems_3", + "systems": "systems_4", "tree": "tree_2", "utils": "utils", "wezterm": "wezterm", @@ -1345,10 +1373,7 @@ }, "rust-overlay": { "inputs": { - "flake-utils": [ - "lanzaboote", - "flake-utils" - ], + "flake-utils": "flake-utils", "nixpkgs": [ "lanzaboote", "nixpkgs" @@ -1647,6 +1672,21 @@ "type": "github" } }, + "systems_4": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "tree": { "inputs": { "nixpkgs": [ diff --git a/home/environments/kde/gtk.nix b/home/environments/kde/gtk.nix index 6ff3c030..da0be91f 100644 --- a/home/environments/kde/gtk.nix +++ b/home/environments/kde/gtk.nix @@ -1,19 +1,2 @@ {pkgs, ...}: { - gtk = { - enable = false; - iconTheme = { - name = "Numix-Square-Light"; - package = pkgs.numix-icon-theme-square; - }; - - theme = { - name = "Arc"; - package = pkgs.arc-theme; - }; - - cursorTheme = { - name = "Numix-Cursor"; - package = pkgs.numix-cursor-theme; - }; - }; } diff --git a/home/environments/kde/kde.nix b/home/environments/kde/kde.nix index e1838730..14631460 100644 --- a/home/environments/kde/kde.nix +++ b/home/environments/kde/kde.nix @@ -1,13 +1,9 @@ {pkgs, ...}: { home.sessionVariables = { - QT_QPA_PLATFORMTHEME = "qt6ct"; - #XDG_BACKEND = "x11"; - XDG_CURRENT_DESKTOP = "kde"; - #GDK_BACKEND = "x11"; + QT_QPA_PLATFORMTHEME = "qt5ct"; }; home.packages = with pkgs.kdePackages; [ kscreen - kwin pkgs.xwayland kscreen libkscreen @@ -24,16 +20,12 @@ plasma-workspace drkonqi # crash handler kde-inotify-survey # warns the user on low inotifywatch limits - pkgs.plasma-applet-commandoutput # Application integration libplasma # provides Kirigami platform theme plasma-integration # provides Qt platform theme kde-gtk-config # syncs KDE settings to GTK - qt6ct - pkgs.libsForQt5.qt5ct - # Artwork + themes breeze breeze-icons @@ -58,27 +50,18 @@ kcmutils ]; programs.plasma = { - enable = true; - workspace = { - }; - fonts = let - katFont = { - family = "Monaspace Krypton"; - pointSize = 10; - }; - in { - general = katFont; - fixedWidth = katFont; - small = katFont // {pointSize = 8;}; - toolbar = katFont; - menu = katFont; - windowTitle = katFont; - }; configFile = { + "kded5rc"."PlasmaBrowserIntegration"."shownCount" = 1; + "kdeglobals"."WM"."activeBackground" = "231,232,235"; + "kdeglobals"."WM"."activeBlend" = "231,232,235"; + "kdeglobals"."WM"."activeForeground" = "92,97,108"; + "kdeglobals"."WM"."inactiveBackground" = "231,232,235"; + "kdeglobals"."WM"."inactiveBlend" = "231,232,235"; + "kdeglobals"."WM"."inactiveForeground" = "163,165,172"; "kdeglobals"."General"."BrowserApplication" = "firefox.desktop"; - "kdeglobals"."General"."TerminalApplication" = "konsole"; + "kdeglobals"."General"."TerminalService" = "org.wezfurlong.wezterm.desktop"; "kxkbrc"."Layout"."ResetOldOptions" = true; - "kxkbrc"."Layout"."Options" = "terminate:ctrl_alt_bksp,ctrl:capscontrol"; + "kxkbrc"."Layout"."Options" = "terminate:ctrl_alt_bksp,ctrl:hyper_capscontrol"; }; }; } diff --git a/nixos/environments/kde/xserver.nix b/nixos/environments/kde/xserver.nix index dfeb7d29..6b8d0220 100644 --- a/nixos/environments/kde/xserver.nix +++ b/nixos/environments/kde/xserver.nix @@ -2,9 +2,7 @@ environment.systemPackages = with pkgs; [ xclip wl-clipboard - kwin-blishhud-shader ]; - environment.plasma6.excludePackages = with pkgs; [konsole]; services = { displayManager.sddm = { enable = true; diff --git a/nixos/profiles/bcachefs.nix b/nixos/profiles/bcachefs.nix index 267cc07f..edd03e07 100644 --- a/nixos/profiles/bcachefs.nix +++ b/nixos/profiles/bcachefs.nix @@ -14,7 +14,6 @@ in { }; config = { boot = { - kernelPackages = pkgs.linuxPackages_latest; supportedFilesystems = ["bcachefs"]; }; }; diff --git a/systems/koishi.nix b/systems/koishi.nix index 684be2d8..84d92484 100644 --- a/systems/koishi.nix +++ b/systems/koishi.nix @@ -19,25 +19,22 @@ _: let secureboot ]) ++ (with tree.nixos.environments; [ - i3 - #sway + #sway #xfce - #openbox - #kde - #gnome + #openbox + kde + #gnome ]); config = { home-manager.users.kat.imports = (with tree.home.profiles; [ graphical - devops ]) ++ (with tree.home.environments; [ - i3 - #xfce - #sway - #kde - #gnome + #xfce + #sway + kde + #gnome ]); fileSystems."/" = {