Skip to content

Commit

Permalink
Update to NixOS 24.11
Browse files Browse the repository at this point in the history
  • Loading branch information
rake5k committed Dec 3, 2024
1 parent 648afb0 commit dea0e54
Show file tree
Hide file tree
Showing 8 changed files with 23 additions and 21 deletions.
16 changes: 8 additions & 8 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand All @@ -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";
};

Expand Down
2 changes: 1 addition & 1 deletion home/programs/ranger/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ in
pandoc
poppler_utils
python3Packages.nbconvert
transmission
transmission_4
trash-cli
ueberzugpp
unrar
Expand Down
9 changes: 4 additions & 5 deletions home/roles/desktop/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion home/roles/desktop/password-manager/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ in

package = mkOption {
type = types.package;
default = pkgs._1password;
default = pkgs._1password-gui;
description = "Password manager package";
};

Expand Down
4 changes: 2 additions & 2 deletions home/roles/desktop/xserver/polybar/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ in
default = true;
};
temperature-source = mkOption {
type = types.string;
type = types.str;
default = "";
description = "Temperature source path";
};
Expand Down Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion home/roles/web/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ in
};

home.packages = with pkgs; [
_1password
_1password-cli
_1password-gui
bind
protonmail-desktop
Expand Down
5 changes: 4 additions & 1 deletion nixos/base/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,10 @@ in

programs = {
nano.enable = false;
vim.defaultEditor = true;
vim = {
enable = true;
defaultEditor = true;
};
zsh.enable = true;
};

Expand Down

0 comments on commit dea0e54

Please sign in to comment.