diff --git a/flake.lock b/flake.lock index 7814d771..873733cf 100644 --- a/flake.lock +++ b/flake.lock @@ -198,16 +198,16 @@ ] }, "locked": { - "lastModified": 1726989464, - "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", + "lastModified": 1733050161, + "narHash": "sha256-lYnT+EYE47f5yY3KS/Kd4pJ6CO9fhCqumkYYkQ3TK20=", "owner": "nix-community", "repo": "home-manager", - "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", + "rev": "62d536255879be574ebfe9b87c4ac194febf47c5", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.05", + "ref": "release-24.11", "repo": "home-manager", "type": "github" } @@ -329,16 +329,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1733016324, - "narHash": "sha256-8qwPSE2g1othR1u4uP86NXxm6i7E9nHPyJX3m3lx7Q4=", + "lastModified": 1732981179, + "narHash": "sha256-F7thesZPvAMSwjRu0K8uFshTk3ZZSNAsXTIFvXBT+34=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7e1ca67996afd8233d9033edd26e442836cc2ad6", + "rev": "62c435d93bf046a5396f3016472e8f7c8e2aed65", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 59c9c011..4654c601 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "NixOS & Home-Manager Configuration"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; nur.url = "github:nix-community/NUR"; @@ -13,7 +13,7 @@ }; home-manager = { - url = "github:nix-community/home-manager/release-24.05"; + url = "github:nix-community/home-manager/release-24.11"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/home/programs/ranger/default.nix b/home/programs/ranger/default.nix index 6bb21de4..a816099e 100644 --- a/home/programs/ranger/default.nix +++ b/home/programs/ranger/default.nix @@ -48,7 +48,7 @@ in pandoc poppler_utils python3Packages.nbconvert - transmission + transmission_4 trash-cli ueberzugpp unrar diff --git a/home/roles/desktop/default.nix b/home/roles/desktop/default.nix index e8f385c3..8dc9fbb5 100644 --- a/home/roles/desktop/default.nix +++ b/home/roles/desktop/default.nix @@ -66,11 +66,10 @@ in }; home.packages = with pkgs; [ - gnome.gnome-characters - gnome.nautilus - gnome.pomodoro - gnome.seahorse - psensor + gnome-characters + gnome-pomodoro + nautilus + seahorse ]; services.gnome-keyring.enable = true; diff --git a/home/roles/desktop/password-manager/default.nix b/home/roles/desktop/password-manager/default.nix index 188625b6..e8a6a8e5 100644 --- a/home/roles/desktop/password-manager/default.nix +++ b/home/roles/desktop/password-manager/default.nix @@ -21,7 +21,7 @@ in package = mkOption { type = types.package; - default = pkgs._1password; + default = pkgs._1password-gui; description = "Password manager package"; }; diff --git a/home/roles/desktop/xserver/polybar/default.nix b/home/roles/desktop/xserver/polybar/default.nix index 8542ea9f..2fbc6840 100644 --- a/home/roles/desktop/xserver/polybar/default.nix +++ b/home/roles/desktop/xserver/polybar/default.nix @@ -87,7 +87,7 @@ in default = true; }; temperature-source = mkOption { - type = types.string; + type = types.str; default = ""; description = "Temperature source path"; }; @@ -321,7 +321,7 @@ in "module/wtr" = { type = "custom/script"; - exec = "${getExe pkgs.bash} ${config.xdg.configFile."polybar/weather-plugin.sh".target}"; + exec = "${getExe pkgs.bash} ${config.xdg.configHome}/polybar/weather-plugin.sh"; tail = false; interval = 600; diff --git a/home/roles/web/default.nix b/home/roles/web/default.nix index 78de5dc8..4bd69be3 100644 --- a/home/roles/web/default.nix +++ b/home/roles/web/default.nix @@ -49,7 +49,7 @@ in }; home.packages = with pkgs; [ - _1password + _1password-cli _1password-gui bind protonmail-desktop diff --git a/home/users/christian/fonts/default.nix b/home/users/christian/fonts/default.nix index 8c549f1c..b8d8f367 100644 --- a/home/users/christian/fonts/default.nix +++ b/home/users/christian/fonts/default.nix @@ -23,7 +23,9 @@ in config = mkIf cfg.enable { home.packages = with pkgs; [ google-fonts - ubuntu_font_family + ubuntu-classic + ubuntu-sans + ubuntu-sans-mono ]; }; } diff --git a/nixos/base/default.nix b/nixos/base/default.nix index cb13bb7a..2de60286 100644 --- a/nixos/base/default.nix +++ b/nixos/base/default.nix @@ -51,7 +51,10 @@ in programs = { nano.enable = false; - vim.defaultEditor = true; + vim = { + enable = true; + defaultEditor = true; + }; zsh.enable = true; };