From 100a4df00655d4a29f91ba97501a1dfda927df5d Mon Sep 17 00:00:00 2001 From: Toast Date: Wed, 30 Aug 2023 00:16:37 +0200 Subject: [PATCH 1/6] Flake: add nix-diff to devShell --- flake.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/flake.nix b/flake.nix index 747da57..b6b1ad4 100755 --- a/flake.nix +++ b/flake.nix @@ -38,6 +38,7 @@ outputs = {nixpkgs, nixpkgs-unstable, agenix, home-manager, home-manager-unstabl agenix.packages.x86_64-linux.default git plasma5Packages.plasma-sdk + nix-diff ]; shellHook ='' export PS1="$PS1(toast-configs)> " From 638cf16a416257aed4ec3d6f766ec0a05e707a55 Mon Sep 17 00:00:00 2001 From: Toast Date: Wed, 30 Aug 2023 00:30:11 +0200 Subject: [PATCH 2/6] Kate: install system-wide --- roles/kde/programs/kate.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/roles/kde/programs/kate.nix b/roles/kde/programs/kate.nix index ff84a90..99b1e5d 100644 --- a/roles/kde/programs/kate.nix +++ b/roles/kde/programs/kate.nix @@ -1,8 +1,5 @@ { config, pkgs, ... }: { - home-manager.users.toast = { config, pkgs, ... }: - { - home.packages = [ pkgs.kate ]; - }; + environment.systemPackages = [ pkgs.kate ]; } From 0a358a8643ee520cfacb5b7af2949efadd78f3f6 Mon Sep 17 00:00:00 2001 From: Toast Date: Wed, 30 Aug 2023 00:36:38 +0200 Subject: [PATCH 3/6] KeepassXC: install with users.users.<>-packages instead of home manager --- roles/desktop/programs/keepassxc.nix | 51 +++++++++++++--------------- 1 file changed, 24 insertions(+), 27 deletions(-) diff --git a/roles/desktop/programs/keepassxc.nix b/roles/desktop/programs/keepassxc.nix index 6ffb436..2bff9ed 100644 --- a/roles/desktop/programs/keepassxc.nix +++ b/roles/desktop/programs/keepassxc.nix @@ -23,36 +23,33 @@ let in { - # I'm only using keepass on my user, so I'm installing it with home-manager + users.users.toast.packages = [ pkgs.keepassxc ]; home-manager = { extraSpecialArgs = { kpxcSettings = kpxcSettings; }; users.toast = { config, pkgs, kpxcSettings, ... }: { - home = { - packages = [ pkgs.keepassxc ]; - # No module for KeePassXC config :( - file = { - ".config/keepassxc/keepassxc.ini".text = kpxcSettings; - # For some reason the autostart .desktop is not the same as the regular one - ".config/autostart/org.keepassxc.KeePassXC.desktop".text = '' - [Desktop Entry] - Name=KeePassXC - GenericName=Password Manager - Exec=keepassxc - TryExec=keepassxc - Icon=keepassxc - StartupWMClass=keepassxc - StartupNotify=true - Terminal=false - Type=Application - Version=1.0 - Categories=Utility;Security;Qt; - MimeType=application/x-keepass2; - X-GNOME-Autostart-enabled=true - X-GNOME-Autostart-Delay=2 - X-KDE-autostart-after=panel - X-LXQt-Need-Tray=true - ''; - }; + # No module for KeePassXC config :( + home.file = { + ".config/keepassxc/keepassxc.ini".text = kpxcSettings; + # For some reason the autostart .desktop is not the same as the regular one + ".config/autostart/org.keepassxc.KeePassXC.desktop".text = '' + [Desktop Entry] + Name=KeePassXC + GenericName=Password Manager + Exec=keepassxc + TryExec=keepassxc + Icon=keepassxc + StartupWMClass=keepassxc + StartupNotify=true + Terminal=false + Type=Application + Version=1.0 + Categories=Utility;Security;Qt; + MimeType=application/x-keepass2; + X-GNOME-Autostart-enabled=true + X-GNOME-Autostart-Delay=2 + X-KDE-autostart-after=panel + X-LXQt-Need-Tray=true + ''; }; }; }; From a0d2ba5c70e22cefd6eafbd6a99b634079ff9c05 Mon Sep 17 00:00:00 2001 From: Toast Date: Wed, 30 Aug 2023 00:54:54 +0200 Subject: [PATCH 4/6] Flake: update lock file --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index e982d67..0468085 100644 --- a/flake.lock +++ b/flake.lock @@ -50,11 +50,11 @@ ] }, "locked": { - "lastModified": 1692503956, - "narHash": "sha256-MOA6FKc1YgfGP3ESnjSYfsyJ1BXlwV5pGlY/u5XdJfY=", + "lastModified": 1693187908, + "narHash": "sha256-cTcNpsqi1llmUFl9bmCdD0mTyfjhBrNFPhu2W12WXzA=", "owner": "nix-community", "repo": "home-manager", - "rev": "958c06303f43cf0625694326b7f7e5475b1a2d5c", + "rev": "8bde7a651b94ba30bd0baaa9c4a08aae88cc2e92", "type": "github" }, "original": { @@ -70,11 +70,11 @@ ] }, "locked": { - "lastModified": 1692099905, - "narHash": "sha256-/pSusGhmIdSdAaywQRFA5dVbfdIzlWQTecM+E46+cJ0=", + "lastModified": 1693208669, + "narHash": "sha256-hHFaaUsZ860wvppPeiu7nJn/nXZjJfnqAQEu9SPFE9I=", "owner": "nix-community", "repo": "home-manager", - "rev": "2a6679aa9cc3872c29ba2a57fe1b71b3e3c5649f", + "rev": "5bac4a1c06cd77cf8fc35a658ccb035a6c50cd2c", "type": "github" }, "original": { @@ -101,11 +101,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1692373088, - "narHash": "sha256-EPgCecdc9I8aTdmDNoO1l7R72r2WPhZRcesV4nzxBj8=", + "lastModified": 1692952286, + "narHash": "sha256-TsrtPv3+Q1KR0avZxpiJH+b6fX/R/hEQVHbjl1ebotY=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "7f1836531b126cfcf584e7d7d71bf8758bb58969", + "rev": "817e297fc3352fadc15f2c5306909aa9192d7d97", "type": "github" }, "original": { @@ -117,11 +117,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1692525914, - "narHash": "sha256-MUgZ9/9mE/EbEQA6JPdcQHkjoR5fgvaKhpy6UO67uEc=", + "lastModified": 1693231525, + "narHash": "sha256-Zmh8m0HHcgGBDth6jdJPmc4UAAP0L4jQmqIztywF1Iw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "475d5ae2c4cb87b904545bdb547af05681198fcc", + "rev": "c540061ac8d72d6e6d99345bd2d590c82b2f58c1", "type": "github" }, "original": { @@ -132,11 +132,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1692447944, - "narHash": "sha256-fkJGNjEmTPvqBs215EQU4r9ivecV5Qge5cF/QDLVn3U=", + "lastModified": 1693250523, + "narHash": "sha256-y3up5gXMTbnCsXrNEB5j+7TVantDLUYyQLu/ueiXuyg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d680ded26da5cf104dd2735a51e88d2d8f487b4d", + "rev": "3efb0f6f404ec8dae31bdb1a9b17705ce0d6986e", "type": "github" }, "original": { From 7765c2a55046fd7313e9280d4a7f2464866dc3ac Mon Sep 17 00:00:00 2001 From: Toast Date: Wed, 30 Aug 2023 00:56:29 +0200 Subject: [PATCH 5/6] Archie: use pipewire as the sound server again --- machines/Archie/configuration.nix | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/machines/Archie/configuration.nix b/machines/Archie/configuration.nix index eb8bc43..dfd748a 100644 --- a/machines/Archie/configuration.nix +++ b/machines/Archie/configuration.nix @@ -33,22 +33,11 @@ # Enable the X11 windowing system. services.xserver.enable = true; - /*# Enable the pipewire sound server + # Enable the pipewire sound server services.pipewire = { enable = true; pulse.enable = true; - }; /* - - /* - Pipewire's audio server seems to be broken for now, so I'm going to - temporarely use pulse as my audio server - */ - services.pipewire = { - audio.enable = false; - pulse.enable = false; - alsa.enable = false; }; - hardware.pulseaudio.enable = true; # Configure keymap in X11 # services.xserver.layout = "us"; From 455790a5b1aa4c287e7604a3026119ee97ced06b Mon Sep 17 00:00:00 2001 From: Toast Date: Wed, 30 Aug 2023 00:57:53 +0200 Subject: [PATCH 6/6] Desktop: install JamesDSP --- roles/desktop/programs/default.nix | 1 + roles/desktop/programs/jamesdsp.nix | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 roles/desktop/programs/jamesdsp.nix diff --git a/roles/desktop/programs/default.nix b/roles/desktop/programs/default.nix index 6aa4825..b25ff4d 100755 --- a/roles/desktop/programs/default.nix +++ b/roles/desktop/programs/default.nix @@ -6,5 +6,6 @@ ./firefox.nix ./micro.nix ./keepassxc.nix + ./jamesdsp.nix ]; } diff --git a/roles/desktop/programs/jamesdsp.nix b/roles/desktop/programs/jamesdsp.nix new file mode 100644 index 0000000..4316cb5 --- /dev/null +++ b/roles/desktop/programs/jamesdsp.nix @@ -0,0 +1,5 @@ +{ config, pkgs, ... }: + +{ + users.users.toast.packages = [ pkgs.jamesdsp ]; +}