From 3baacc92e7bcde797aa2edc59f3695574412acbd Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Tue, 5 Mar 2024 10:48:25 +0100 Subject: [PATCH 1/7] add gimp Signed-off-by: Harald Hoyer --- modules/nixos/gui/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/nixos/gui/default.nix b/modules/nixos/gui/default.nix index 6af2ebf..2208d41 100644 --- a/modules/nixos/gui/default.nix +++ b/modules/nixos/gui/default.nix @@ -81,6 +81,7 @@ in firefox gh git + gimp gnome.gnome-software gnomeExtensions.appindicator gnomeExtensions.dash-to-panel From 03b18a0883d2c3890d89eabc9f7cfee8f04d907d Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Tue, 5 Mar 2024 14:08:56 +0100 Subject: [PATCH 2/7] fix toolbox desktop entry Signed-off-by: Harald Hoyer --- homes/x86_64-linux/harald@x1/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/homes/x86_64-linux/harald@x1/default.nix b/homes/x86_64-linux/harald@x1/default.nix index e0842dd..b7d27b2 100644 --- a/homes/x86_64-linux/harald@x1/default.nix +++ b/homes/x86_64-linux/harald@x1/default.nix @@ -41,7 +41,7 @@ favorite-apps = [ "org.gnome.Console.desktop" - "JetBrains Toolbox.desktop" + "jetbrains-toolbox.desktop" "org.mozilla.firefox.desktop" "firefox.desktop" "thunderbird.desktop" From 87ae75e8145d1cb0256d5acf5d0c618556e91054 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Tue, 5 Mar 2024 14:09:22 +0100 Subject: [PATCH 3/7] add unstable for jetbrains-toolbox Signed-off-by: Harald Hoyer --- flake.lock | 25 +++++++++++++++++++++---- flake.nix | 3 +++ overlays/jetbrains-toolbox/default.nix | 7 +++++++ 3 files changed, 31 insertions(+), 4 deletions(-) create mode 100644 overlays/jetbrains-toolbox/default.nix diff --git a/flake.lock b/flake.lock index 0292090..8558127 100644 --- a/flake.lock +++ b/flake.lock @@ -1104,11 +1104,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1709309926, - "narHash": "sha256-VZFBtXGVD9LWTecGi6eXrE0hJ/mVB3zGUlHImUs2Qak=", + "lastModified": 1709569716, + "narHash": "sha256-iOR44RU4jQ+YPGrn+uQeYAp7Xo7Z/+gT+wXJoGxxLTY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "79baff8812a0d68e24a836df0a364c678089e2c7", + "rev": "617579a787259b9a6419492eaac670a5f7663917", "type": "github" }, "original": { @@ -1689,7 +1689,8 @@ "home-manager": "home-manager", "neovim-flake": "neovim-flake", "nixpkgs": "nixpkgs_4", - "snowfall-lib": "snowfall-lib" + "snowfall-lib": "snowfall-lib", + "unstable": "unstable" } }, "rust-overlay": { @@ -2004,6 +2005,22 @@ "type": "github" } }, + "unstable": { + "locked": { + "lastModified": 1709479366, + "narHash": "sha256-n6F0n8UV6lnTZbYPl1A9q1BS0p4hduAv1mGAP17CVd0=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "b8697e57f10292a6165a20f03d2f42920dfaf973", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "utils": { "locked": { "lastModified": 1656928814, diff --git a/flake.nix b/flake.nix index f312352..e92bde1 100644 --- a/flake.nix +++ b/flake.nix @@ -4,6 +4,9 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11"; + # NixPkgs Unstable (nixos-unstable) + unstable.url = "github:nixos/nixpkgs/nixos-unstable"; + snowfall-lib = { url = "github:snowfallorg/lib"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/overlays/jetbrains-toolbox/default.nix b/overlays/jetbrains-toolbox/default.nix new file mode 100644 index 0000000..e5429aa --- /dev/null +++ b/overlays/jetbrains-toolbox/default.nix @@ -0,0 +1,7 @@ +{ channels, ... }: + +final: prev: + +{ + inherit (channels.unstable) jetbrains-toolbox; +} From 61c6a2d5ed2ab4aa1b3e22dac361e265f8debdcd Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Tue, 5 Mar 2024 14:10:26 +0100 Subject: [PATCH 4/7] update unstable channel on updates Signed-off-by: Harald Hoyer --- systems/x86_64-linux/x1/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/systems/x86_64-linux/x1/default.nix b/systems/x86_64-linux/x1/default.nix index 93836bd..aba8aaf 100644 --- a/systems/x86_64-linux/x1/default.nix +++ b/systems/x86_64-linux/x1/default.nix @@ -12,7 +12,10 @@ with lib.plusultra; enable = true; operation = "boot"; allowReboot = false; - flags = [ "--update-input" "nixpkgs" ]; + flags = [ + "--update-input" "nixpkgs" + "--update-input" "unstable" + ]; flake = "git+https://git.hoyer.xyz/harald/nixcfg#x1"; }; From bd5f29a97c77ed2d9902e0c13ea3e394036d0220 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Tue, 5 Mar 2024 14:10:50 +0100 Subject: [PATCH 5/7] use latest kernel Signed-off-by: Harald Hoyer --- systems/x86_64-linux/x1/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/systems/x86_64-linux/x1/default.nix b/systems/x86_64-linux/x1/default.nix index aba8aaf..3504785 100644 --- a/systems/x86_64-linux/x1/default.nix +++ b/systems/x86_64-linux/x1/default.nix @@ -33,6 +33,7 @@ with lib.plusultra; timeout = 2; }; initrd.systemd.enable = true; + kernelPackages = lib.mkOverride 0 pkgs.linuxPackages_latest; }; # Configure console keymap From b170cf6309976f59db80ef98a497bfd88448694c Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Tue, 5 Mar 2024 14:11:03 +0100 Subject: [PATCH 6/7] add virt-manager Signed-off-by: Harald Hoyer --- systems/x86_64-linux/x1/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/systems/x86_64-linux/x1/default.nix b/systems/x86_64-linux/x1/default.nix index 3504785..d50ee2f 100644 --- a/systems/x86_64-linux/x1/default.nix +++ b/systems/x86_64-linux/x1/default.nix @@ -69,6 +69,7 @@ with lib.plusultra; tpm2-pkcs11.out tpm2-tools vim + virt-manager wget ]; shells = [ pkgs.fish pkgs.bash ]; From cab06248d249e6fe87a037b60f5b0478fb3c57f6 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Tue, 5 Mar 2024 14:17:36 +0100 Subject: [PATCH 7/7] x1: no ssh home-manager config Signed-off-by: Harald Hoyer --- homes/x86_64-linux/harald@x1/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/homes/x86_64-linux/harald@x1/default.nix b/homes/x86_64-linux/harald@x1/default.nix index b7d27b2..ac916d8 100644 --- a/homes/x86_64-linux/harald@x1/default.nix +++ b/homes/x86_64-linux/harald@x1/default.nix @@ -20,7 +20,6 @@ tools = { git.enable = true; direnv.enable = true; - ssh.enable = true; }; };