bertof/nix-dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update to 24.05

Browse source
This commit is contained in:
Filippo Berto 2024-05-29 13:45:48 +02:00
parent c84fe9bb12
commit ed1a2c021a
No known key found for this signature in database
GPG key ID: FE98AE5EC52B1056
11 changed files with 39 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

22
flake.lock generated
View file

@ -252,16 +252,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1715381426, "lastModified": 1716736833,
"narHash": "sha256-wPuqrAQGdv3ISs74nJfGb+Yprm23U/rFpcHFFNWgM94=", "narHash": "sha256-rNObca6dm7Qs524O4st8VJH6pZ/Xe1gxl+Rx6mcWYo0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "ab5542e9dbd13d0100f8baae2bc2d68af901f4b4", "rev": "a631666f5ec18271e86a5cde998cba68c33d9ac6",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-23.11", "ref": "release-24.05",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -404,11 +404,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1710695816, "lastModified": 1716633019,
"narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=", "narHash": "sha256-xim1b5/HZYbWaZKyI7cn9TJCM6ewNVZnesRr00mXeS4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "614b4613980a522ba49f0d194531beddbb7220d3", "rev": "9d29cd266cebf80234c98dd0b87256b6be0af44e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -436,16 +436,16 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1716425819, "lastModified": 1716978651,
"narHash": "sha256-KV3uHxF0mKUMK7v8wsiH7r/TVdFkHHTB07h7DXkSgdI=", "narHash": "sha256-/U3QuNaj1HxsxIQSqpk26FkLKWSmdfbZ7Ui+kMHgNsM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a520272adde270fd7b0d0d28fc30c91b90f17c86", "rev": "9600c69366c711335f13305fd9518b7dcd3cae18",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "release-23.11", "ref": "release-24.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

8
flake.nix
View file

@ -4,9 +4,9 @@
inputs = { inputs = {
flake-compat.url = "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"; 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"; 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"; }; }; # home-manager-u = { url = "github:nix-community/home-manager"; inputs = { nixpkgs.follows = "nixpkgs-u"; }; };
agenix = { url = "github:ryantm/agenix"; inputs.nixpkgs.follows = "nixpkgs"; }; agenix = { url = "github:ryantm/agenix"; inputs.nixpkgs.follows = "nixpkgs"; };
@ -15,7 +15,7 @@
nix-rice.url = "github:bertof/nix-rice"; nix-rice.url = "github:bertof/nix-rice";
nixos-generators = { url = "github:nix-community/nixos-generators"; inputs = { nixpkgs.follows = "nixpkgs"; }; }; nixos-generators = { url = "github:nix-community/nixos-generators"; inputs = { nixpkgs.follows = "nixpkgs"; }; };
nixos-hardware.url = "github:NixOS/nixos-hardware"; 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, ... }: 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 = [ permittedInsecurePackages = [
# "zotero-6.0.27" # "zotero-6.0.27"
# "electron-24.8.6" # Bitwarden # "electron-24.8.6" # Bitwarden
"electron-25.9.0" # Obsidian # "electron-25.9.0" # Obsidian
]; ];
}; };

2
instances/freya/configuration.nix
View file

@ -64,7 +64,7 @@ in
avahi = { avahi = {
enable = true; enable = true;
openFirewall = true; openFirewall = true;
nssmdns = true; nssmdns4 = true;
publish = { publish = {
enable = true; enable = true;
addresses = true; addresses = true;

2
instances/loki/configuration.nix
View file

@ -67,7 +67,7 @@ in
avahi = { avahi = {
enable = true; enable = true;
openFirewall = true; openFirewall = true;
nssmdns = true; nssmdns4 = true;
publish = { publish = {
enable = true; enable = true;
addresses = true; addresses = true;

11
instances/odin/common_configuration.nix
View file

@ -108,12 +108,11 @@
# }; # };
# windowManager.bspwm.enable = true; # windowManager.bspwm.enable = true;
# Configure keymap in X11 xkb = {
layout = "it,us"; layout = "it,us";
xkbOptions = "eurosign:e,terminate:ctrl_alt_bksp,compose:rctrl,grp:menu_toggle"; options = "eurosign:e,terminate:ctrl_alt_bksp,compose:rctrl,grp:menu_toggle";
libinput.enable = true; };
displayManager.defaultSession = "hyprland";
displayManager.gdm.enable = true; displayManager.gdm.enable = true;
# displayManager.sddm = { # displayManager.sddm = {
# enable = true; # enable = true;
@ -122,6 +121,8 @@
# "${pkgs.sddm-theme-clairvoyance}/usr/share/sddm/themes/clairvoyance"; # "${pkgs.sddm-theme-clairvoyance}/usr/share/sddm/themes/clairvoyance";
# }; # };
}; };
displayManager = { enable = true; defaultSession = "hyprland"; };
libinput.enable = true;
keybase.enable = true; keybase.enable = true;
@ -250,7 +251,7 @@
avahi = { avahi = {
enable = true; enable = true;
openFirewall = true; openFirewall = true;
nssmdns = true; nssmdns4 = true;
publish = { publish = {
enable = true; enable = true;
addresses = true; addresses = true;

5
instances/odin/configuration-nvidia.nix
View file

@ -26,5 +26,10 @@
}; };
}; };
programs.alvr = {
enable = true;
openFirewall = true;
};
services.xserver.videoDrivers = [ "nvidia" ]; services.xserver.videoDrivers = [ "nvidia" ];
} }

7
instances/thor/configuration.nix
View file

@ -127,7 +127,7 @@
avahi = { avahi = {
enable = true; enable = true;
openFirewall = true; openFirewall = true;
nssmdns = true; nssmdns4 = true;
publish = { publish = {
enable = true; enable = true;
addresses = true; addresses = true;
@ -193,9 +193,10 @@
# }; # };
videoDrivers = [ "nvidia" ]; videoDrivers = [ "nvidia" ];
xkb = {
layout = "us,it"; layout = "us,it";
xkbOptions = options = "eurosign:e,terminate:ctrl_alt_bksp,compose:rctrl,grp:menu_toggle";
"eurosign:e,terminate:ctrl_alt_bksp,compose:rctrl,grp:menu_toggle"; };
xrandrHeads = [{ xrandrHeads = [{
primary = true; primary = true;
output = "DP-4"; output = "DP-4";

2
modules/hm/development/docker.nix
View file

@ -1,5 +1,5 @@
{ pkgs, config, lib, ... }: { { 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; }); ++ lib.optionals config.programs.helix.enable (builtins.attrValues { inherit (pkgs.nodePackages) dockerfile-language-server-nodejs; });
home.shellAliases = { home.shellAliases = {
"dkcd" = "docker-compose down"; "dkcd" = "docker-compose down";

2
modules/hm/development/nix.nix
View file

@ -1,6 +1,6 @@
{ pkgs, config, lib, ... }: { { pkgs, config, lib, ... }: {
home.packages = 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.helix.enable [ pkgs.nil ]
++ lib.optionals config.programs.kakoune.enable [ pkgs.rnix-lsp ]; ++ lib.optionals config.programs.kakoune.enable [ pkgs.rnix-lsp ];
programs.neovim.plugins = [ pkgs.vimPlugins.vim-nix ]; programs.neovim.plugins = [ pkgs.vimPlugins.vim-nix ];

3
modules/hm/exa.nix
View file

@ -1,7 +1,8 @@
{ {
programs.eza = { programs.eza = {
enable = true; enable = true;
enableAliases = true; enableBashIntegration = true;
enableZshIntegration = true;
}; };
} }

2
modules/hm/gtk_theme.nix
View file

@ -14,7 +14,7 @@
qt = { qt = {
enable = true; enable = true;
platformTheme = "gtk"; platformTheme.name = "gtk";
}; };
home = { home = {