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

Fix keyboard configuration and cleanup

Browse source
This commit is contained in:
Filippo Berto 2022-05-11 17:19:15 +02:00
parent 2d937f8f8b
commit d02c81a189
6 changed files with 30 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

56
flake.nix
View file

@ -51,12 +51,8 @@
(rust-overlay.overlay)
(final: prev: { inherit (tex2nix.packages.${system}) tex2nix; })
(final: prev: {
# cocktail-bar-cli = final.callPackage ./custom/cocktail-bar-cli { };
update-background = final.callPackage ./custom/update-background { backgrounds_directory = "$HOME/Immagini/Sfondi/1080+/1440+"; };
lockscreen = final.callPackage ./custom/lockscreen {
palette = final.rice.colorPalette;
font = final.rice.font.normal;
};
lockscreen = final.callPackage ./custom/lockscreen { palette = final.rice.colorPalette; font = final.rice.font.normal; };
})
(final: prev: { unstable = unstablePkgs; })
];
@ -70,13 +66,7 @@
};
pkgs = import nixpkgs nixpkgsSettings;
unstablePkgs = import unstable nixpkgsSettings;
homeManagerSettings = {
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
};
};
homeManagerSettings = { home-manager = { useGlobalPkgs = true; useUserPackages = true; }; };
odinBaseModules = [
{ nixpkgs = nixpkgsSettings; }
@ -95,14 +85,14 @@
./thor/configuration.nix
];
odinStable = extraModules: nixpkgs.lib.nixosSystem {
inherit system;
modules = odinBaseModules ++ [
home-manager.nixosModules.home-manager
homeManagerSettings
{ home-manager.users.bertof = import ./home_manager/odin.nix; }
] ++ extraModules;
};
# odinStable = extraModules: nixpkgs.lib.nixosSystem {
# inherit system;
# modules = odinBaseModules ++ [
# home-manager.nixosModules.home-manager
# homeManagerSettings
# { home-manager.users.bertof = import ./home_manager/odin.nix; }
# ] ++ extraModules;
# };
odinUnstable = extraModules: unstable.lib.nixosSystem {
inherit system;
@ -113,14 +103,14 @@
] ++ extraModules;
};
thorStable = extraModules: nixpkgs.lib.nixosSystem {
inherit system;
modules = thorBaseModules ++ [
home-manager.nixosModules.home-manager
homeManagerSettings
{ home-manager.users.bertof = import ./home_manager/thor.nix; }
] ++ extraModules;
};
# thorStable = extraModules: nixpkgs.lib.nixosSystem {
# inherit system;
# modules = thorBaseModules ++ [
# home-manager.nixosModules.home-manager
# homeManagerSettings
# { home-manager.users.bertof = import ./home_manager/thor.nix; }
# ] ++ extraModules;
# };
thorUnstable = extraModules: unstable.lib.nixosSystem {
inherit system;
@ -137,18 +127,18 @@
nixosConfigurations = rec {
thor = thor-stable;
thor = thor-unstable;
thor-stable = thorStable [ ./nixos_modules/pro_audio.nix ];
# thor-stable = thorStable [ ./nixos_modules/pro_audio.nix ];
thor-unstable = thorUnstable [ ./nixos_modules/pro_audio.nix ];
thor-big-data = thorUnstable [ ./nixos_modules/pro_audio.nix ./nixos_modules/big_data.nix ];
odin = odin-intel-stable;
odin = odin-intel-unstable;
odin-intel-unstable = odinUnstable [ ./odin/configuration-intel.nix ./nixos_modules/pro_audio.nix ];
odin-nvidia-unstable = odinUnstable [ ./odin/configuration-nvidia.nix ./nixos_modules/pro_audio.nix ];
odin-intel-stable = odinStable [ ./odin/configuration-intel.nix ./nixos_modules/pro_audio.nix ];
odin-nvidia-stable = odinStable [ ./odin/configuration-nvidia.nix ./nixos_modules/pro_audio.nix ];
# odin-intel-stable = odinStable [ ./odin/configuration-intel.nix ./nixos_modules/pro_audio.nix ];
# odin-nvidia-stable = odinStable [ ./odin/configuration-nvidia.nix ./nixos_modules/pro_audio.nix ];
};
};
}