diff --git a/README.md b/README.md index fd07dcf..d97b2a2 100644 --- a/README.md +++ b/README.md @@ -18,6 +18,8 @@ nix-channel update nix flake update # Update system nixos-rebuild switch --flake '.#stefan' --upgrade +# Build Image +nix build .#vm ``` ### Clean old generations: diff --git a/flake.lock b/flake.lock index 6b93dcd..48537ea 100644 --- a/flake.lock +++ b/flake.lock @@ -21,67 +21,20 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1694465129, - "narHash": "sha256-8BQiuobMrCfCbGM7w6Snx+OBYdtTIm0+cGVaKwQ5BFg=", + "lastModified": 1720042825, + "narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=", "owner": "nix-community", "repo": "home-manager", - "rev": "9787dffff5d315c9593d3f9fb0f9bf2097e1b57b", + "rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-23.05", + "ref": "release-24.05", "repo": "home-manager", "type": "github" } }, - "hyprland": { - "inputs": { - "hyprland-protocols": "hyprland-protocols", - "nixpkgs": "nixpkgs_2", - "systems": "systems", - "wlroots": "wlroots", - "xdph": "xdph" - }, - "locked": { - "lastModified": 1694703353, - "narHash": "sha256-4zE6asZoWo7V0HRUNDDE+kX/RT/ofkvK/NXq/rwqCr8=", - "owner": "hyprwm", - "repo": "Hyprland", - "rev": "f8008e4b3beb4aae2365973879a46fe0f15c79b4", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "Hyprland", - "type": "github" - } - }, - "hyprland-protocols": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1691753796, - "narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=", - "owner": "hyprwm", - "repo": "hyprland-protocols", - "rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-protocols", - "type": "github" - } - }, "mail-signature": { "flake": false, "locked": { @@ -101,11 +54,11 @@ "nix-zsh-completions": { "flake": false, "locked": { - "lastModified": 1691441408, - "narHash": "sha256-DKvCpjAeCiUwD5l6PUW7WlEvM0cNZEOk41IiVXoh9D8=", + "lastModified": 1717877171, + "narHash": "sha256-B7m+HIoq5ApGZC3zsSD3AFd2VF0UurLmkVAmi1+zF4o=", "owner": "spwhitt", "repo": "nix-zsh-completions", - "rev": "247e8cc192be84f15d93e68c79b4277aba6361d4", + "rev": "57fb88c6b4b1c261087dd0bd27470e263b23d80d", "type": "github" }, "original": { @@ -116,11 +69,11 @@ }, "nixlib": { "locked": { - "lastModified": 1693701915, - "narHash": "sha256-waHPLdDYUOHSEtMKKabcKIMhlUOHPOOPQ9UyFeEoovs=", + "lastModified": 1719708727, + "narHash": "sha256-XFNKtyirrGNdehpg7lMNm1skEcBApjqGhaHc/OI95HY=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "f5af57d3ef9947a70ac86e42695231ac1ad00c25", + "rev": "1bba8a624b3b9d4f68db94fb63aaeb46039ce9e6", "type": "github" }, "original": { @@ -132,11 +85,11 @@ "nixos-artwork": { "flake": false, "locked": { - "lastModified": 1694288448, - "narHash": "sha256-zKnCjwVsLuubxBzLsvGFrIyU84+isXai/pshSPDUlP0=", + "lastModified": 1719676066, + "narHash": "sha256-78FyNyGtDZogJUWcCT6A/T2MK87nGN/muC7ANH1b1V8=", "owner": "nixos", "repo": "artwork", - "rev": "e7e665687ff9d80550e26948405511bc70b5c6de", + "rev": "de03e887f03037e7e781a678b57fdae603c9ca20", "type": "github" }, "original": { @@ -153,11 +106,11 @@ ] }, "locked": { - "lastModified": 1693791338, - "narHash": "sha256-wHmtB5H8AJTUaeGHw+0hsQ6nU4VyvVrP2P4NeCocRzY=", + "lastModified": 1720859326, + "narHash": "sha256-i8BiZj5faQS6gsupE0S9xtiyZmWinGpVLwxXWV342aQ=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "8ee78470029e641cddbd8721496da1316b47d3b4", + "rev": "076ea5b672bb1ea535ee84cfdabd0c2f0b7f20c7", "type": "github" }, "original": { @@ -169,11 +122,11 @@ "nixos-hardware": { "flake": false, "locked": { - "lastModified": 1694681873, - "narHash": "sha256-ajOF6dGmJ+CRKxIHvtcVW9Xh0C6FWmN/crlq1sa4qhU=", + "lastModified": 1720737798, + "narHash": "sha256-G/OtEAts7ZUvW5lrGMXSb8HqRp2Jr9I7reBuvCOL54w=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "850b04d59cbc003158b5258932dab6e26ed0b388", + "rev": "c5013aa7ce2c7ec90acee5d965d950c8348db751", "type": "github" }, "original": { @@ -184,16 +137,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1687466461, - "narHash": "sha256-oupXI7g7RPzlpGUfAu1xG4KBK53GrZH8/xeKgKDB4+Q=", - "owner": "nixos", + "lastModified": 1716542732, + "narHash": "sha256-0Y9fRr0CUqWT4KgBITmaGwlnNIGMYuydu2L8iLTfHU4=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "ecb441f22067ba1d6312f4932a7c64efa8d19a7b", + "rev": "d12251ef6e8e6a46e05689eeccd595bdbd3c9e60", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-23.05", + "owner": "NixOS", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } @@ -201,11 +154,11 @@ "nixpkgs-fmt": { "flake": false, "locked": { - "lastModified": 1694529264, - "narHash": "sha256-DEKAFsrXoxdmaFDmmQ5HseeWyfJHcfut0ZBkcHfWCTo=", + "lastModified": 1710146057, + "narHash": "sha256-GLZNcoQT3AWGg1ZINKOgHcD1/LgDStI6hZbfsisjOgM=", "owner": "nix-community", "repo": "nixpkgs-fmt", - "rev": "45460f512b0a7ae85b4123f2f58fe311f5724397", + "rev": "f048515c9a98d7e2e4b034ec77641acc8a58098d", "type": "github" }, "original": { @@ -216,27 +169,27 @@ }, "nixpkgs-old": { "locked": { - "lastModified": 1694499547, - "narHash": "sha256-R7xMz1Iia6JthWRHDn36s/E248WB1/je62ovC/dUVKI=", + "lastModified": 1720954236, + "narHash": "sha256-1mEKHp4m9brvfQ0rjCca8P1WHpymK3TOr3v34ydv9bs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e5f018cf150e29aac26c61dac0790ea023c46b24", + "rev": "53e81e790209e41f0c1efa9ff26ff2fd7ab35e27", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.05", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-unstable": { "locked": { - "lastModified": 1694422566, - "narHash": "sha256-lHJ+A9esOz9vln/3CJG23FV6Wd2OoOFbDeEs4cMGMqc=", + "lastModified": 1720957393, + "narHash": "sha256-oedh2RwpjEa+TNxhg5Je9Ch6d3W1NKi7DbRO1ziHemA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3a2786eea085f040a66ecde1bc3ddc7099f6dbeb", + "rev": "693bc46d169f5af9c992095736e82c3488bf7dbb", "type": "github" }, "original": { @@ -248,43 +201,27 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1694183432, - "narHash": "sha256-YyPGNapgZNNj51ylQMw9lAgvxtM2ai1HZVUu3GS8Fng=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "db9208ab987cdeeedf78ad9b4cf3c55f5ebd269b", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1694499547, - "narHash": "sha256-R7xMz1Iia6JthWRHDn36s/E248WB1/je62ovC/dUVKI=", + "lastModified": 1720954236, + "narHash": "sha256-1mEKHp4m9brvfQ0rjCca8P1WHpymK3TOr3v34ydv9bs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e5f018cf150e29aac26c61dac0790ea023c46b24", + "rev": "53e81e790209e41f0c1efa9ff26ff2fd7ab35e27", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.05", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } }, "nur": { "locked": { - "lastModified": 1694683373, - "narHash": "sha256-8uX7dr/3bboa36JRU1FMoLIB/nHSn7Z0nZsyzXlLWd8=", + "lastModified": 1721111312, + "narHash": "sha256-e9dEXzJvK0USACzsCs4TqjrA+Zwl+FyaYnimkviXkLA=", "owner": "nix-community", "repo": "NUR", - "rev": "603cbb28d868a5feb4f249209a6c15823a7cd5ae", + "rev": "fb94373b5852a86518fecf5b9c3c5632c830669b", "type": "github" }, "original": { @@ -297,13 +234,12 @@ "inputs": { "gpg-config": "gpg-config", "home-manager": "home-manager", - "hyprland": "hyprland", "mail-signature": "mail-signature", "nix-zsh-completions": "nix-zsh-completions", "nixos-artwork": "nixos-artwork", "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "nixpkgs-fmt": "nixpkgs-fmt", "nixpkgs-old": "nixpkgs-old", "nixpkgs-unstable": "nixpkgs-unstable", @@ -314,11 +250,11 @@ "rycee": { "flake": false, "locked": { - "lastModified": 1694643084, - "narHash": "sha256-t3BBrWnaoZn/iRnEPCr7jsHgv+RhRiwGQlwNGJ36aO0=", + "lastModified": 1721102596, + "narHash": "sha256-NwkxySooO4c+0AmWz+199HKB7cyZAOuzdqwDyYYJrow=", "owner": "rycee", "repo": "nur-expressions", - "rev": "03b1d923dad88c6f76638d82dd8629a5b40d18b7", + "rev": "2004d4c0218505901d8fad29948f1a1191f658f6", "type": "gitlab" }, "original": { @@ -326,69 +262,6 @@ "repo": "nur-expressions", "type": "gitlab" } - }, - "systems": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, - "wlroots": { - "flake": false, - "locked": { - "host": "gitlab.freedesktop.org", - "lastModified": 1694302348, - "narHash": "sha256-S9NOc88L/1jpNKJqBu2Hihvn0V1HHCK2hXE4bNBAStg=", - "owner": "wlroots", - "repo": "wlroots", - "rev": "65bbbbbf0c3d6844cee3c4e294d0ba07e1f82211", - "type": "gitlab" - }, - "original": { - "host": "gitlab.freedesktop.org", - "owner": "wlroots", - "repo": "wlroots", - "rev": "65bbbbbf0c3d6844cee3c4e294d0ba07e1f82211", - "type": "gitlab" - } - }, - "xdph": { - "inputs": { - "hyprland-protocols": [ - "hyprland", - "hyprland-protocols" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1694363988, - "narHash": "sha256-RF6LXm4J6mBF3B8VcQuABuU4g4tCPHgMYJQSoJ3DW+8=", - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "rev": "aca51609d4c415b30e88b96c6f49f0142cbcdae7", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 33244b7..8cac74c 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "NixOS configuration with flakes"; inputs = { - home-manager.url = "github:nix-community/home-manager/release-23.05"; + home-manager.url = "github:nix-community/home-manager/release-24.05"; # NixOS profiles covering hardware quirks: # https://github.com/NixOS/nixos-hardware @@ -23,8 +23,8 @@ # nixpkgs versions nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; - nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05"; - nixpkgs-old.url = "github:NixOS/nixpkgs/nixos-23.05"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; + nixpkgs-old.url = "github:NixOS/nixpkgs/nixos-24.05"; # Nix formatter nixpkgs-fmt = { diff --git a/modules/apps/messaging/default.nix b/modules/apps/messaging/default.nix index 6bf659d..7e48b11 100644 --- a/modules/apps/messaging/default.nix +++ b/modules/apps/messaging/default.nix @@ -6,10 +6,6 @@ slack discord element-desktop - - tdesktop - threema-desktop - signal-desktop ]; }; } diff --git a/modules/apps/shell/zsh.nix b/modules/apps/shell/zsh.nix index f3ab559..8670f93 100644 --- a/modules/apps/shell/zsh.nix +++ b/modules/apps/shell/zsh.nix @@ -21,7 +21,7 @@ programs.zsh = { enable = true; enableCompletion = true; - enableAutosuggestions = true; + autosuggestion.enable = true; oh-my-zsh = { enable = true; diff --git a/modules/apps/tools/crypto.nix b/modules/apps/tools/crypto.nix index 7cbfa17..9eba691 100644 --- a/modules/apps/tools/crypto.nix +++ b/modules/apps/tools/crypto.nix @@ -10,7 +10,7 @@ programs.gnupg.agent = { enable = true; - pinentryFlavor = "curses"; + pinentryPackage = pkgs.pinentry-curses; enableSSHSupport = true; }; diff --git a/modules/apps/web/google-chrome.nix b/modules/apps/web/google-chrome.nix index ad8a922..4a91219 100644 --- a/modules/apps/web/google-chrome.nix +++ b/modules/apps/web/google-chrome.nix @@ -5,5 +5,6 @@ google-chrome tor torsocks + lynx ]; } diff --git a/modules/hardware/bluetooth.nix b/modules/hardware/bluetooth.nix index 27271d3..02d51f7 100644 --- a/modules/hardware/bluetooth.nix +++ b/modules/hardware/bluetooth.nix @@ -7,7 +7,7 @@ enable = true; # Enable all bluez plugins - package = pkgs.bluezFull; + package = pkgs.bluez; # Modern headsets will generally try to connect using the A2DP profile. # To enable this we need to add the following lines: diff --git a/modules/home.nix b/modules/home.nix index e0fec45..82326f5 100644 --- a/modules/home.nix +++ b/modules/home.nix @@ -12,7 +12,7 @@ # Stop obsolte services from the previous generation systemd.user.startServices = true; - home.stateVersion = "23.05"; + home.stateVersion = "24.05"; }; }; } diff --git a/modules/nix.nix b/modules/nix.nix index c2c1796..c7a1a7b 100644 --- a/modules/nix.nix +++ b/modules/nix.nix @@ -2,7 +2,7 @@ { nix = { # use unstable nix so we can access flakes - package = pkgs.nixUnstable; + package = pkgs.nixFlakes; extraOptions = '' experimental-features = nix-command flakes keep-outputs = true diff --git a/modules/nixpkgs.nix b/modules/nixpkgs.nix index 0d0a5b7..b9d6c33 100644 --- a/modules/nixpkgs.nix +++ b/modules/nixpkgs.nix @@ -5,7 +5,7 @@ }; environment.systemPackages = [ (pkgs.writeShellScriptBin "nixFlakes" '' - exec ${pkgs.nixUnstable}/bin/nix --experimental-features "nix-command flakes" "$@" + exec ${pkgs.nixFlakes}/bin/nix --experimental-features "nix-command flakes" "$@" '') ]; } diff --git a/modules/services.nix b/modules/services.nix index dd71f47..8df4757 100644 --- a/modules/services.nix +++ b/modules/services.nix @@ -70,7 +70,7 @@ xserver = { # Configure keymap in X11 - layout = "us,de"; + xkb.layout = "us,de"; }; }; diff --git a/modules/system.nix b/modules/system.nix index 4231beb..a93ad27 100644 --- a/modules/system.nix +++ b/modules/system.nix @@ -6,6 +6,6 @@ # this value at the release version of the first install of this system. # Before changing this value read the documentation for this option # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). - stateVersion = "23.05"; # Did you read the comment? + stateVersion = "24.05"; # Did you read the comment? }; } diff --git a/modules/workspace/fonts.nix b/modules/workspace/fonts.nix index 75e7cef..975100e 100644 --- a/modules/workspace/fonts.nix +++ b/modules/workspace/fonts.nix @@ -18,14 +18,14 @@ # Enable a basic set of fonts providing font styles and # families and reasonable coverage of Unicode - enableDefaultFonts = true; + enableDefaultPackages = true; # Create a directory with links to all fonts in # /run/current-system/sw/share/X11/fonts fontDir.enable = true; # List of primary font paths - fonts = with pkgs; [ + packages = with pkgs; [ ibm-plex jetbrains-mono hasklig diff --git a/modules/workspace/qt.nix b/modules/workspace/qt.nix index 5fe0425..260c304 100644 --- a/modules/workspace/qt.nix +++ b/modules/workspace/qt.nix @@ -2,7 +2,7 @@ home-manager.users.stefan = { qt = { enable = true; - platformTheme = "gtk"; + platformTheme.name = "gtk"; }; }; }