From 872134db56cff27431d22df1eabd04d4c26e92d6 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 13 Feb 2025 01:20:32 +0100 Subject: [PATCH] update theming, update flake lock, enable gnupg --- flake.lock | 137 ++++++++++-------- flake.nix | 1 + .../package-configs/plasma-desktop.nix | 6 +- home-manager/shared/default.nix | 4 + home-manager/shared/ssh/default.nix | 3 +- nixos/hosts/GLaDOS/configuration.nix | 42 +++--- nixos/shared/default.nix | 5 + 7 files changed, 114 insertions(+), 84 deletions(-) diff --git a/flake.lock b/flake.lock index c01b6e4..bdcad20 100644 --- a/flake.lock +++ b/flake.lock @@ -81,11 +81,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1737930863, - "narHash": "sha256-dDVOhR64CMYwcYmL+OEwZ8rKPvmBSLGrEg8oCMLbftc=", + "lastModified": 1738881161, + "narHash": "sha256-MlHp5a8hLJBD1TOln+ZrbgC+3tEeCSW8A3ZFqMhXbVw=", "owner": "koverstreet", "repo": "bcachefs-tools", - "rev": "895fc9a101e5145d886fa000791f259589db30d7", + "rev": "553e605886847c9182f0fee47faa32fee907f65b", "type": "github" }, "original": { @@ -115,11 +115,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1737579274, - "narHash": "sha256-8kBIYfn8TI9jbffhDNS12SdbQHb9ITXflwcgIJBeGqw=", + "lastModified": 1739283129, + "narHash": "sha256-GXJllf1wY7tOF6uei9S3PnSEghFbnJP1vkxM0kkMOoI=", "owner": "catppuccin", "repo": "nix", - "rev": "06f0ea19334bcc8112e6d671fd53e61f9e3ad63a", + "rev": "d4e258e29075a86a82dacaf4f5e0985935ae4658", "type": "github" }, "original": { @@ -166,11 +166,11 @@ }, "crane_3": { "locked": { - "lastModified": 1736898272, - "narHash": "sha256-D10wlrU/HCpSRcb3a7yk+bU3ggpMD1kGbseKtO+7teo=", + "lastModified": 1739053031, + "narHash": "sha256-LrMDRuwAlRFD2T4MgBSRd1s2VtOE+Vl1oMCNu3RpPE0=", "owner": "ipetkov", "repo": "crane", - "rev": "6a589f034202a7c6e10bce6c5d1d392d7bc0f340", + "rev": "112e6591b2d6313b1bd05a80a754a8ee42432a7e", "type": "github" }, "original": { @@ -186,11 +186,11 @@ ] }, "locked": { - "lastModified": 1738148035, - "narHash": "sha256-KYOATYEwaKysL3HdHdS5kbQMXvzS4iPJzJrML+3TKAo=", + "lastModified": 1739353546, + "narHash": "sha256-YTqXhBZvCdZLMBupWlCDvRFaTEhaHa2/Xc/p1sUdSZU=", "owner": "nix-community", "repo": "disko", - "rev": "18d0a984cc2bc82cf61df19523a34ad463aa7f54", + "rev": "26ade1005191e0602a78b0f141970648445bafd9", "type": "github" }, "original": { @@ -509,11 +509,11 @@ ] }, "locked": { - "lastModified": 1738448366, - "narHash": "sha256-4ATtQqBlgsGqkHTemta0ydY6f7JBRXz4Hf574NHQpkg=", + "lastModified": 1739314552, + "narHash": "sha256-ggVf2BclyIW3jexc/uvgsgJH4e2cuG6Nyg54NeXgbFI=", "owner": "nix-community", "repo": "home-manager", - "rev": "18fa9f323d8adbb0b7b8b98a8488db308210ed93", + "rev": "83bd3a26ac0526ae04fa74df46738bb44b89dcdd", "type": "github" }, "original": { @@ -531,11 +531,11 @@ ] }, "locked": { - "lastModified": 1736785676, - "narHash": "sha256-TY0jUwR3EW0fnS0X5wXMAVy6h4Z7Y6a3m+Yq++C9AyE=", + "lastModified": 1737630279, + "narHash": "sha256-wJQCxyMRc4P26zDrHmZiRD5bbfcJpqPG3e2djdGG3pk=", "owner": "nix-community", "repo": "home-manager", - "rev": "fc52a210b60f2f52c74eac41a8647c1573d2071d", + "rev": "0db5c8bfcce78583ebbde0b2abbc95ad93445f7c", "type": "github" }, "original": { @@ -550,11 +550,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1738478597, - "narHash": "sha256-it7lc+HRSQiLV+3CcA+c6fkr2355HyT2GGUowHdfa/E=", + "lastModified": 1739364465, + "narHash": "sha256-LhyeVj5plHO3/3QV7SzOSOnvl0sehOjE4h6LHaiiJqU=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "77fb0818cb42ca0db98839d47bbc6a317c286282", + "rev": "3dab95e02b5eeb9aec44a161bbed2b16b3d03aac", "type": "github" }, "original": { @@ -573,11 +573,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1737639419, - "narHash": "sha256-AEEDktApTEZ5PZXNDkry2YV2k6t0dTgLPEmAZbnigXU=", + "lastModified": 1739186342, + "narHash": "sha256-2j+sln9RwQn+g7J4GmdFFgvqXnLkvWBNMaUzONlkzUE=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "a65905a09e2c43ff63be8c0e86a93712361f871e", + "rev": "3bdeebbc484a09391c4f0ec8a37bb77809426660", "type": "github" }, "original": { @@ -615,11 +615,11 @@ ] }, "locked": { - "lastModified": 1738466368, - "narHash": "sha256-PZhUjtvQZOH3PO0EYdTpQvcqkgkq1NkP2A6w9SPHYsk=", + "lastModified": 1739071773, + "narHash": "sha256-/Ak+Quinhmdxa9m3shjm4lwwwqmzG8zzGhhhhgR1k9I=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "46a8f5fc9552b776bfc5c5c96ea3bede33f68f52", + "rev": "895d81b6228bbd50a6ef22f5a58a504ca99763ea", "type": "github" }, "original": { @@ -666,11 +666,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1738471961, - "narHash": "sha256-cgXDFrplNGs7bCVzXhRofjD8oJYqqXGcmUzXjHmip6Y=", + "lastModified": 1738816619, + "narHash": "sha256-5yRlg48XmpcX5b5HesdGMOte+YuCy9rzQkJz+imcu6I=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "537286c3c59b40311e5418a180b38034661d2536", + "rev": "2eccff41bab80839b1d25b303b53d339fbb07087", "type": "github" }, "original": { @@ -713,11 +713,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1738504305, - "narHash": "sha256-UE4t3SwSVTeI/rQNEHTcRRgiAejsqoLaBcEcqKJmf0U=", + "lastModified": 1739373903, + "narHash": "sha256-K8daEVDugtjXlX65s47tOAuu0Wo/bQKuWUrQCYRmOpM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "704972b62824cbf70c0ac11815cd4ef9460b9b6e", + "rev": "e418be764c2d2f2390b66ca52851b8439db4fb1c", "type": "github" }, "original": { @@ -744,11 +744,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1738410390, - "narHash": "sha256-xvTo0Aw0+veek7hvEVLzErmJyQkEcRk6PSR4zsRQFEc=", + "lastModified": 1739214665, + "narHash": "sha256-26L8VAu3/1YRxS8MHgBOyOM8xALdo6N0I04PgorE7UM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3a228057f5b619feb3186e986dbe76278d707b6e", + "rev": "64e75cd44acf21c7933d61d7721e812eac1b5a0a", "type": "github" }, "original": { @@ -760,11 +760,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1736012469, - "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", + "lastModified": 1739214665, + "narHash": "sha256-26L8VAu3/1YRxS8MHgBOyOM8xALdo6N0I04PgorE7UM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", + "rev": "64e75cd44acf21c7933d61d7721e812eac1b5a0a", "type": "github" }, "original": { @@ -792,11 +792,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1738410390, - "narHash": "sha256-xvTo0Aw0+veek7hvEVLzErmJyQkEcRk6PSR4zsRQFEc=", + "lastModified": 1739214665, + "narHash": "sha256-26L8VAu3/1YRxS8MHgBOyOM8xALdo6N0I04PgorE7UM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3a228057f5b619feb3186e986dbe76278d707b6e", + "rev": "64e75cd44acf21c7933d61d7721e812eac1b5a0a", "type": "github" }, "original": { @@ -855,11 +855,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1737003892, - "narHash": "sha256-RCzJE9wKByLCXmRBp+z8LK9EgdW+K+W/DXnJS4S/NVo=", + "lastModified": 1739138025, + "narHash": "sha256-M4ilIfGxzbBZuURokv24aqJTbdjPA9K+DtKUzrJaES4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ae06b9c2d83cb5c8b12d7d0e32692e93d1379713", + "rev": "b2243f41e860ac85c0b446eadc6930359b294e79", "type": "github" }, "original": { @@ -988,11 +988,11 @@ ] }, "locked": { - "lastModified": 1737166965, - "narHash": "sha256-vlDROBAgq+7PEVM0vaS2zboY6DXs3oKK0qW/1dVuFs4=", + "lastModified": 1739240901, + "narHash": "sha256-YDtl/9w71m5WcZvbEroYoWrjECDhzJZLZ8E68S3BYok=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "fc839c9d5d1ebc789b4657c43c4d54838c7c01de", + "rev": "03473e2af8a4b490f4d2cdb2e4d3b75f82c8197c", "type": "github" }, "original": { @@ -1009,11 +1009,11 @@ "nixpkgs-24_11": "nixpkgs-24_11" }, "locked": { - "lastModified": 1737736848, - "narHash": "sha256-VrUfCXBXYV+YmQ2OvVTeML9EnmaPRtH+POrNIcJp6yo=", + "lastModified": 1739121270, + "narHash": "sha256-EmJhpy9U8sVlepl2QPjG019VfG67HcucsQNItTqW6cA=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "6b425d13f5a9d73cb63973d3609acacef4d1e261", + "rev": "8c1c4640b878c692dd3d8055e8cdea0a2bbd8cf3", "type": "gitlab" }, "original": { @@ -1028,11 +1028,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1738291974, - "narHash": "sha256-wkwYJc8cKmmQWUloyS9KwttBnja2ONRuJQDEsmef320=", + "lastModified": 1739262228, + "narHash": "sha256-7JAGezJ0Dn5qIyA2+T4Dt/xQgAbhCglh6lzCekTVMeU=", "owner": "Mic92", "repo": "sops-nix", - "rev": "4c1251904d8a08c86ac6bc0d72cc09975e89aef7", + "rev": "07af005bb7d60c7f118d9d9f5530485da5d1e975", "type": "github" }, "original": { @@ -1057,15 +1057,16 @@ "systems": "systems_2", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", + "tinted-schemes": "tinted-schemes", "tinted-tmux": "tinted-tmux", "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1738278499, - "narHash": "sha256-q1SUyXSQ9znHTME53/vPLe+Ga3V1wW3X3gWfa8JsBUM=", + "lastModified": 1739309576, + "narHash": "sha256-IMK19j1b2VH44lUad2/3BSski9T4ecrCHFlkjKWQV2o=", "owner": "danth", "repo": "stylix", - "rev": "b00c9f46ae6c27074d24d2db390f0ac5ebcc329f", + "rev": "d8289c3f0e5995863921ea207392c122f5d59f6d", "type": "github" }, "original": { @@ -1153,6 +1154,22 @@ "type": "github" } }, + "tinted-schemes": { + "flake": false, + "locked": { + "lastModified": 1737565458, + "narHash": "sha256-y+9cvOA6BLKT0WfebDsyUpUa/YxKow9hTjBp6HpQv68=", + "owner": "tinted-theming", + "repo": "schemes", + "rev": "ae31625ba47aeaa4bf6a98cf11a8d4886f9463d9", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "schemes", + "type": "github" + } + }, "tinted-tmux": { "flake": false, "locked": { @@ -1214,11 +1231,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1738084440, - "narHash": "sha256-sARyUquyuNapFbICL/PJEhcDgBzpxTcHUNw8R/xL1iA=", + "lastModified": 1739291143, + "narHash": "sha256-uSxFyFTPsngoJSxO7F+Aoa/iPPHSvd3O0kpocMSa3qc=", "owner": "dj95", "repo": "zjstatus", - "rev": "096dc72a909fd0fb34768a98354aad6207002671", + "rev": "db29b512909ebcb30f79113bab6c5c7c5e66f861", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index b65194f..0e94b48 100644 --- a/flake.nix +++ b/flake.nix @@ -198,6 +198,7 @@ jovian.nixosModules.jovian # > Our main nixos configuration file < ./nixos/hosts/GLaDOS/configuration.nix + lanzaboote.nixosModules.lanzaboote ]; }; diff --git a/home-manager/desktop/package-configs/plasma-desktop.nix b/home-manager/desktop/package-configs/plasma-desktop.nix index c76c860..84908cc 100644 --- a/home-manager/desktop/package-configs/plasma-desktop.nix +++ b/home-manager/desktop/package-configs/plasma-desktop.nix @@ -1,4 +1,8 @@ -{osConfig, ...}: { +{ + osConfig, + lib, + ... +}: { home.file.".config/kdeconnect/config" = { text = '' [General] diff --git a/home-manager/shared/default.nix b/home-manager/shared/default.nix index 327eb26..13bf4d8 100644 --- a/home-manager/shared/default.nix +++ b/home-manager/shared/default.nix @@ -1,6 +1,7 @@ { pkgs, osConfig, + lib, ... }: { imports = [ @@ -53,6 +54,9 @@ }; }; stylix.enable = true; + qt.platformTheme.name = lib.mkForce "kvantum"; + qt.style.name = lib.mkForce "kvantum"; + # stylix = { # enable = true; # autoEnable = true; diff --git a/home-manager/shared/ssh/default.nix b/home-manager/shared/ssh/default.nix index 8dccaac..aef7a98 100644 --- a/home-manager/shared/ssh/default.nix +++ b/home-manager/shared/ssh/default.nix @@ -1,6 +1,5 @@ {...}: { - # TODO: make this dynamic instead of hard coded - home.file."config" = { + home.file."sshconfig" = { source = ./config; target = ".config/ssh/config"; force = true; diff --git a/nixos/hosts/GLaDOS/configuration.nix b/nixos/hosts/GLaDOS/configuration.nix index c93a152..ef21414 100644 --- a/nixos/hosts/GLaDOS/configuration.nix +++ b/nixos/hosts/GLaDOS/configuration.nix @@ -51,24 +51,24 @@ ]; }; programs = { - gamemode.enable = true; - gamemode.settings = { - general = { - renice = 10; - }; + # gamemode.enable = false; + # gamemode.settings = { + # general = { + # renice = 10; + # }; - # Warning: GPU optimisations have the potential to damage hardware - # gpu = { - # apply_gpu_optimisations = "accept-responsibility"; - # gpu_device = 0; - # amd_performance_level = "high"; - # }; + # # Warning: GPU optimisations have the potential to damage hardware + # # gpu = { + # # apply_gpu_optimisations = "accept-responsibility"; + # # gpu_device = 0; + # # amd_performance_level = "high"; + # # }; - custom = { - start = "${pkgs.libnotify}/bin/notify-send 'GameMode started'"; - end = "${pkgs.libnotify}/bin/notify-send 'GameMode ended'"; - }; - }; + # custom = { + # start = "${pkgs.libnotify}/bin/notify-send 'GameMode started'"; + # end = "${pkgs.libnotify}/bin/notify-send 'GameMode ended'"; + # }; + # }; }; jovian = { @@ -87,13 +87,13 @@ }; boot = { - loader.systemd-boot.enable = true; + loader.systemd-boot.enable = false; }; - # boot.lanzaboote = { - # enable = true; - # pkiBundle = "/etc/secureboot"; - # }; + boot.lanzaboote = { + enable = true; + pkiBundle = "/var/lib/sbctl"; + }; users.users.lillian.extraGroups = ["gamemode"]; diff --git a/nixos/shared/default.nix b/nixos/shared/default.nix index 5a5866d..d0584db 100644 --- a/nixos/shared/default.nix +++ b/nixos/shared/default.nix @@ -80,6 +80,11 @@ enable = true; }; + programs.gnupg.agent = { + enable = true; + enableBrowserSocket = true; + }; + stylix = { enable = true; autoEnable = true;