From ed1a2c021ab6ac73d26c7ecbdae16fd77d2b7006 Mon Sep 17 00:00:00 2001 From: Filippo Berto Date: Wed, 29 May 2024 13:45:48 +0200 Subject: [PATCH] Update to 24.05 --- flake.lock | 22 +++++++++++----------- flake.nix | 8 ++++---- instances/freya/configuration.nix | 2 +- instances/loki/configuration.nix | 2 +- instances/odin/common_configuration.nix | 13 +++++++------ instances/odin/configuration-nvidia.nix | 5 +++++ instances/thor/configuration.nix | 9 +++++---- modules/hm/development/docker.nix | 2 +- modules/hm/development/nix.nix | 2 +- modules/hm/exa.nix | 3 ++- modules/hm/gtk_theme.nix | 2 +- 11 files changed, 39 insertions(+), 31 deletions(-) diff --git a/flake.lock b/flake.lock index 89f8a90..7524e0a 100644 --- a/flake.lock +++ b/flake.lock @@ -252,16 +252,16 @@ ] }, "locked": { - "lastModified": 1715381426, - "narHash": "sha256-wPuqrAQGdv3ISs74nJfGb+Yprm23U/rFpcHFFNWgM94=", + "lastModified": 1716736833, + "narHash": "sha256-rNObca6dm7Qs524O4st8VJH6pZ/Xe1gxl+Rx6mcWYo0=", "owner": "nix-community", "repo": "home-manager", - "rev": "ab5542e9dbd13d0100f8baae2bc2d68af901f4b4", + "rev": "a631666f5ec18271e86a5cde998cba68c33d9ac6", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-23.11", + "ref": "release-24.05", "repo": "home-manager", "type": "github" } @@ -404,11 +404,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1710695816, - "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=", + "lastModified": 1716633019, + "narHash": "sha256-xim1b5/HZYbWaZKyI7cn9TJCM6ewNVZnesRr00mXeS4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "614b4613980a522ba49f0d194531beddbb7220d3", + "rev": "9d29cd266cebf80234c98dd0b87256b6be0af44e", "type": "github" }, "original": { @@ -436,16 +436,16 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1716425819, - "narHash": "sha256-KV3uHxF0mKUMK7v8wsiH7r/TVdFkHHTB07h7DXkSgdI=", + "lastModified": 1716978651, + "narHash": "sha256-/U3QuNaj1HxsxIQSqpk26FkLKWSmdfbZ7Ui+kMHgNsM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a520272adde270fd7b0d0d28fc30c91b90f17c86", + "rev": "9600c69366c711335f13305fd9518b7dcd3cae18", "type": "github" }, "original": { "owner": "NixOS", - "ref": "release-23.11", + "ref": "release-24.05", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 10a3aa5..cd9d564 100644 --- a/flake.nix +++ b/flake.nix @@ -4,9 +4,9 @@ inputs = { flake-compat.url = "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"; - nixpkgs.url = "github:NixOS/nixpkgs/release-23.11"; + nixpkgs.url = "github:NixOS/nixpkgs/release-24.05"; nixpkgs-u.url = "github:NixOS/nixpkgs/nixos-unstable"; - home-manager = { url = "github:nix-community/home-manager/release-23.11"; inputs.nixpkgs.follows = "nixpkgs"; }; + home-manager = { url = "github:nix-community/home-manager/release-24.05"; inputs.nixpkgs.follows = "nixpkgs"; }; # home-manager-u = { url = "github:nix-community/home-manager"; inputs = { nixpkgs.follows = "nixpkgs-u"; }; }; agenix = { url = "github:ryantm/agenix"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -15,7 +15,7 @@ nix-rice.url = "github:bertof/nix-rice"; nixos-generators = { url = "github:nix-community/nixos-generators"; inputs = { nixpkgs.follows = "nixpkgs"; }; }; nixos-hardware.url = "github:NixOS/nixos-hardware"; - pre-commit-hooks = { url = "github:cachix/pre-commit-hooks.nix"; inputs = { nixpkgs.follows = "nixpkgs"; flake-utils.follows = "flake-utils"; }; }; + pre-commit-hooks = { url = "github:cachix/pre-commit-hooks.nix"; inputs = { nixpkgs.follows = "nixpkgs"; }; }; }; outputs = { self, nixpkgs, nixpkgs-u, home-manager, agenix, deploy-rs, flake-utils, nixos-generators, nixos-hardware, nix-rice, pre-commit-hooks, ... }: @@ -26,7 +26,7 @@ permittedInsecurePackages = [ # "zotero-6.0.27" # "electron-24.8.6" # Bitwarden - "electron-25.9.0" # Obsidian + # "electron-25.9.0" # Obsidian ]; }; diff --git a/instances/freya/configuration.nix b/instances/freya/configuration.nix index 75f6898..0275334 100644 --- a/instances/freya/configuration.nix +++ b/instances/freya/configuration.nix @@ -64,7 +64,7 @@ in avahi = { enable = true; openFirewall = true; - nssmdns = true; + nssmdns4 = true; publish = { enable = true; addresses = true; diff --git a/instances/loki/configuration.nix b/instances/loki/configuration.nix index ad9fa15..71f13bd 100644 --- a/instances/loki/configuration.nix +++ b/instances/loki/configuration.nix @@ -67,7 +67,7 @@ in avahi = { enable = true; openFirewall = true; - nssmdns = true; + nssmdns4 = true; publish = { enable = true; addresses = true; diff --git a/instances/odin/common_configuration.nix b/instances/odin/common_configuration.nix index 8cec6bc..87519f5 100644 --- a/instances/odin/common_configuration.nix +++ b/instances/odin/common_configuration.nix @@ -108,12 +108,11 @@ # }; # windowManager.bspwm.enable = true; - # Configure keymap in X11 - layout = "it,us"; - xkbOptions = "eurosign:e,terminate:ctrl_alt_bksp,compose:rctrl,grp:menu_toggle"; - libinput.enable = true; + xkb = { + layout = "it,us"; + options = "eurosign:e,terminate:ctrl_alt_bksp,compose:rctrl,grp:menu_toggle"; + }; - displayManager.defaultSession = "hyprland"; displayManager.gdm.enable = true; # displayManager.sddm = { # enable = true; @@ -122,6 +121,8 @@ # "${pkgs.sddm-theme-clairvoyance}/usr/share/sddm/themes/clairvoyance"; # }; }; + displayManager = { enable = true; defaultSession = "hyprland"; }; + libinput.enable = true; keybase.enable = true; @@ -250,7 +251,7 @@ avahi = { enable = true; openFirewall = true; - nssmdns = true; + nssmdns4 = true; publish = { enable = true; addresses = true; diff --git a/instances/odin/configuration-nvidia.nix b/instances/odin/configuration-nvidia.nix index ec147b0..43355e1 100644 --- a/instances/odin/configuration-nvidia.nix +++ b/instances/odin/configuration-nvidia.nix @@ -26,5 +26,10 @@ }; }; + programs.alvr = { + enable = true; + openFirewall = true; + }; + services.xserver.videoDrivers = [ "nvidia" ]; } diff --git a/instances/thor/configuration.nix b/instances/thor/configuration.nix index 153ce5d..26c2eaf 100644 --- a/instances/thor/configuration.nix +++ b/instances/thor/configuration.nix @@ -127,7 +127,7 @@ avahi = { enable = true; openFirewall = true; - nssmdns = true; + nssmdns4 = true; publish = { enable = true; addresses = true; @@ -193,9 +193,10 @@ # }; videoDrivers = [ "nvidia" ]; - layout = "us,it"; - xkbOptions = - "eurosign:e,terminate:ctrl_alt_bksp,compose:rctrl,grp:menu_toggle"; + xkb = { + layout = "us,it"; + options = "eurosign:e,terminate:ctrl_alt_bksp,compose:rctrl,grp:menu_toggle"; + }; xrandrHeads = [{ primary = true; output = "DP-4"; diff --git a/modules/hm/development/docker.nix b/modules/hm/development/docker.nix index 52e8291..5f62ec4 100644 --- a/modules/hm/development/docker.nix +++ b/modules/hm/development/docker.nix @@ -1,5 +1,5 @@ { pkgs, config, lib, ... }: { - home.packages = (builtins.attrValues { inherit (pkgs) docker-compose docker-machine; }) + home.packages = (builtins.attrValues { inherit (pkgs) docker-compose; }) ++ lib.optionals config.programs.helix.enable (builtins.attrValues { inherit (pkgs.nodePackages) dockerfile-language-server-nodejs; }); home.shellAliases = { "dkcd" = "docker-compose down"; diff --git a/modules/hm/development/nix.nix b/modules/hm/development/nix.nix index c2977fe..967b77d 100644 --- a/modules/hm/development/nix.nix +++ b/modules/hm/development/nix.nix @@ -1,6 +1,6 @@ { pkgs, config, lib, ... }: { home.packages = - (builtins.attrValues { inherit (pkgs) nixpkgs-fmt nixfmt nix-prefetch-scripts nixpkgs-review nix-tree; }) + (builtins.attrValues { inherit (pkgs) nixpkgs-fmt nixfmt-classic nix-prefetch-scripts nixpkgs-review nix-tree; }) ++ lib.optionals config.programs.helix.enable [ pkgs.nil ] ++ lib.optionals config.programs.kakoune.enable [ pkgs.rnix-lsp ]; programs.neovim.plugins = [ pkgs.vimPlugins.vim-nix ]; diff --git a/modules/hm/exa.nix b/modules/hm/exa.nix index 08cf557..7912180 100644 --- a/modules/hm/exa.nix +++ b/modules/hm/exa.nix @@ -1,7 +1,8 @@ { programs.eza = { enable = true; - enableAliases = true; + enableBashIntegration = true; + enableZshIntegration = true; }; } diff --git a/modules/hm/gtk_theme.nix b/modules/hm/gtk_theme.nix index 09e6dd3..955ed11 100644 --- a/modules/hm/gtk_theme.nix +++ b/modules/hm/gtk_theme.nix @@ -14,7 +14,7 @@ qt = { enable = true; - platformTheme = "gtk"; + platformTheme.name = "gtk"; }; home = {