diff --git a/flake.lock b/flake.lock index 8558127..0292090 100644 --- a/flake.lock +++ b/flake.lock @@ -1104,11 +1104,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1709569716, - "narHash": "sha256-iOR44RU4jQ+YPGrn+uQeYAp7Xo7Z/+gT+wXJoGxxLTY=", + "lastModified": 1709309926, + "narHash": "sha256-VZFBtXGVD9LWTecGi6eXrE0hJ/mVB3zGUlHImUs2Qak=", "owner": "nixos", "repo": "nixpkgs", - "rev": "617579a787259b9a6419492eaac670a5f7663917", + "rev": "79baff8812a0d68e24a836df0a364c678089e2c7", "type": "github" }, "original": { @@ -1689,8 +1689,7 @@ "home-manager": "home-manager", "neovim-flake": "neovim-flake", "nixpkgs": "nixpkgs_4", - "snowfall-lib": "snowfall-lib", - "unstable": "unstable" + "snowfall-lib": "snowfall-lib" } }, "rust-overlay": { @@ -2005,22 +2004,6 @@ "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 e92bde1..f312352 100644 --- a/flake.nix +++ b/flake.nix @@ -4,9 +4,6 @@ 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/homes/x86_64-linux/harald@x1/default.nix b/homes/x86_64-linux/harald@x1/default.nix index ac916d8..e0842dd 100644 --- a/homes/x86_64-linux/harald@x1/default.nix +++ b/homes/x86_64-linux/harald@x1/default.nix @@ -20,6 +20,7 @@ tools = { git.enable = true; direnv.enable = true; + ssh.enable = true; }; }; @@ -40,7 +41,7 @@ favorite-apps = [ "org.gnome.Console.desktop" - "jetbrains-toolbox.desktop" + "JetBrains Toolbox.desktop" "org.mozilla.firefox.desktop" "firefox.desktop" "thunderbird.desktop" diff --git a/modules/nixos/gui/default.nix b/modules/nixos/gui/default.nix index 2208d41..6af2ebf 100644 --- a/modules/nixos/gui/default.nix +++ b/modules/nixos/gui/default.nix @@ -81,7 +81,6 @@ in firefox gh git - gimp gnome.gnome-software gnomeExtensions.appindicator gnomeExtensions.dash-to-panel diff --git a/overlays/jetbrains-toolbox/default.nix b/overlays/jetbrains-toolbox/default.nix deleted file mode 100644 index e5429aa..0000000 --- a/overlays/jetbrains-toolbox/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ channels, ... }: - -final: prev: - -{ - inherit (channels.unstable) jetbrains-toolbox; -} diff --git a/systems/x86_64-linux/x1/default.nix b/systems/x86_64-linux/x1/default.nix index d50ee2f..93836bd 100644 --- a/systems/x86_64-linux/x1/default.nix +++ b/systems/x86_64-linux/x1/default.nix @@ -12,10 +12,7 @@ with lib.plusultra; enable = true; operation = "boot"; allowReboot = false; - flags = [ - "--update-input" "nixpkgs" - "--update-input" "unstable" - ]; + flags = [ "--update-input" "nixpkgs" ]; flake = "git+https://git.hoyer.xyz/harald/nixcfg#x1"; }; @@ -33,7 +30,6 @@ with lib.plusultra; timeout = 2; }; initrd.systemd.enable = true; - kernelPackages = lib.mkOverride 0 pkgs.linuxPackages_latest; }; # Configure console keymap @@ -69,7 +65,6 @@ with lib.plusultra; tpm2-pkcs11.out tpm2-tools vim - virt-manager wget ]; shells = [ pkgs.fish pkgs.bash ];