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

Cleanup flake

Browse source
This commit is contained in:
Filippo Berto 2022-08-29 17:07:02 +02:00
parent 70f54e2739
commit 70d0060df5
No known key found for this signature in database
GPG key ID: FE98AE5EC52B1056
3 changed files with 112 additions and 130 deletions
Download patch file Download diff file Expand all files Collapse all files

52
flake.lock generated
View file

@ -36,19 +36,19 @@
"type": "github" "type": "github"
} }
}, },
"home-manager-unstable": { "home-manager-u": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"unstable" "nixpkgs-u"
], ],
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1661284925, "lastModified": 1661573386,
"narHash": "sha256-DKxOkYrhbdBt2t+C3rpJrEBsM6A63jP92TM+XnUKyho=", "narHash": "sha256-pBEg8iY00Af/SAtU2dlmOAv+2x7kScaGlFRDjNoVJO8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "353d21e108790a4823c9fae9812dc953e8994399", "rev": "d89bdff445eadff03fe414e9c30486bc8166b72b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -110,6 +110,22 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-u": {
"locked": {
"lastModified": 1661628722,
"narHash": "sha256-oR/7NhG7pPkACToUtaaT6hH+rONE2z5/4NzjoUwEZt8=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "324c8aaf25b2f2027af7798e5582ce3040a793b6",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1661309001, "lastModified": 1661309001,
@ -157,7 +173,7 @@
"flake-utils" "flake-utils"
], ],
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs-u"
] ]
}, },
"locked": { "locked": {
@ -178,13 +194,13 @@
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"home-manager": "home-manager", "home-manager": "home-manager",
"home-manager-unstable": "home-manager-unstable", "home-manager-u": "home-manager-u",
"nix-rice": "nix-rice", "nix-rice": "nix-rice",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"nixpkgs-u": "nixpkgs-u",
"pre-commit-hooks": "pre-commit-hooks_2", "pre-commit-hooks": "pre-commit-hooks_2",
"tex2nix": "tex2nix", "tex2nix": "tex2nix"
"unstable": "unstable"
} }
}, },
"tex2nix": { "tex2nix": {
@ -193,7 +209,7 @@
"flake-utils" "flake-utils"
], ],
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs-u"
] ]
}, },
"locked": { "locked": {
@ -210,22 +226,6 @@
"type": "github" "type": "github"
} }
}, },
"unstable": {
"locked": {
"lastModified": 1661239211,
"narHash": "sha256-pNJzBlSNpWEiFJZnLF2oETYq8cGWx1DJPW33aMtG6n8=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5e804cd8a27f835a402b22e086e36e797716ef8b",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"utils": { "utils": {
"locked": { "locked": {
"lastModified": 1653893745, "lastModified": 1653893745,

174
flake.nix
View file

@ -5,23 +5,23 @@
nixpkgs.url = "github:NixOS/nixpkgs/release-22.05"; nixpkgs.url = "github:NixOS/nixpkgs/release-22.05";
home-manager = { url = "github:nix-community/home-manager/release-22.05"; inputs.nixpkgs.follows = "nixpkgs"; }; home-manager = { url = "github:nix-community/home-manager/release-22.05"; inputs.nixpkgs.follows = "nixpkgs"; };
unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs-u.url = "github:NixOS/nixpkgs/nixos-unstable";
home-manager-unstable = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "unstable"; }; home-manager-u = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs-u"; };
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
nixos-hardware.url = "github:NixOS/nixos-hardware"; nixos-hardware.url = "github:NixOS/nixos-hardware";
nix-rice = { url = "github:bertof/nix-rice"; inputs.inxpkgs.follows = "unstable"; inputs.flake-utils.follows = "flake-utils"; }; nix-rice = { url = "github:bertof/nix-rice"; inputs = { inxpkgs.follows = "nixpkgs-u"; flake-utils.follows = "flake-utils"; }; };
pre-commit-hooks = { url = "github:cachix/pre-commit-hooks.nix"; inputs.nixpkgs.follows = "nixpkgs"; inputs.flake-utils.follows = "flake-utils"; }; pre-commit-hooks = { url = "github:cachix/pre-commit-hooks.nix"; inputs = { nixpkgs.follows = "nixpkgs-u"; flake-utils.follows = "flake-utils"; }; };
tex2nix = { url = github:Mic92/tex2nix; inputs.nixpkgs.follows = "nixpkgs"; inputs.flake-utils.follows = "flake-utils"; }; tex2nix = { url = "github:Mic92/tex2nix"; inputs = { nixpkgs.follows = "nixpkgs-u"; flake-utils.follows = "flake-utils"; }; };
}; };
outputs = outputs =
{ self { self
, nixpkgs , nixpkgs
, home-manager , home-manager
, unstable , nixpkgs-u
, home-manager-unstable , home-manager-u
, flake-utils , flake-utils
, nixos-hardware , nixos-hardware
, tex2nix , tex2nix
@ -29,146 +29,120 @@
, pre-commit-hooks , pre-commit-hooks
}: }:
let let
system = "x86_64-linux";
overlaysBuilder = system: [ overlaysBuilder = system: [
(_: _: { inherit (tex2nix.packages.${system}) tex2nix; stable = pkgs { inherit system; }; unstable = pkgs-u { inherit system; }; })
(nix-rice.overlays.default) (nix-rice.overlays.default)
(import ./rice.nix) (import ./rice.nix)
(_: _: { inherit (tex2nix.packages.${system}) tex2nix; })
(final: _: { (final: _: {
update-background = final.callPackage ./custom/update-background { backgrounds_directory = "$HOME/Immagini/Sfondi/1080+/1440+"; }; 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; };
sddm-theme-clairvoyance = final.callPackage ./custom/sddm-theme-clairvoyance { wallpaper = ./wallpapers/comfy_waves.jpg; }; sddm-theme-clairvoyance = final.callPackage ./custom/sddm-theme-clairvoyance { wallpaper = ./wallpapers/comfy_waves.jpg; };
}) })
(_: _: { stable = pkgs; })
(_: _: { unstable = unstablePkgs; })
]; ];
nixpkgsSettings = { defaultConfig = {
inherit system;
overlays = overlaysBuilder system;
config = {
extraOptions = "experimental-features = nix-command flakes"; extraOptions = "experimental-features = nix-command flakes";
allowUnfree = true; allowUnfree = true;
permittedInsecurePackages = [ "electron-9.4.4" ]; # authy dependency permittedInsecurePackages = [ "electron-9.4.4" ]; # authy dependency
}; };
}; nixpkgsSettings = { system, overlays ? overlaysBuilder system, config ? defaultConfig }: { inherit system overlays config; };
pkgs = import nixpkgs nixpkgsSettings; pkgs = s: import nixpkgs (nixpkgsSettings s);
unstablePkgs = import unstable nixpkgsSettings; pkgs-u = s: import nixpkgs-u (nixpkgsSettings s);
homeManagerSettings = { home-manager = { useGlobalPkgs = true; useUserPackages = true; }; }; homeManagerSettings = { home-manager = { useGlobalPkgs = true; useUserPackages = true; }; };
commonBaseModules = [ commonBaseModules = [
./nixos_modules/automatic-garbage-collection.nix ./nixos_modules/automatic-garbage-collection.nix
# ./nixos_modules/tailscale.nix
./nixos_modules/zerotier.nix ./nixos_modules/zerotier.nix
]; ];
homeManagerModules = users: [
home-manager.nixosModules.home-manager
homeManagerSettings
{ home-manager.users = users; }
];
homeManagerUModules = users: [
home-manager-u.nixosModules.home-manager
homeManagerSettings
{ home-manager.users = users; }
];
odinBaseModules = [ odinBaseModules = [
{ nixpkgs = nixpkgsSettings; }
./odin/hardware-configuration.nix ./odin/hardware-configuration.nix
nixos-hardware.nixosModules.common-cpu-intel nixos-hardware.nixosModules.common-cpu-intel
nixos-hardware.nixosModules.common-pc-laptop nixos-hardware.nixosModules.common-pc-laptop
nixos-hardware.nixosModules.common-pc-laptop-ssd nixos-hardware.nixosModules.common-pc-laptop-ssd
./odin/common_configuration.nix ./odin/common_configuration.nix
] ++ commonBaseModules;
./nixos_modules/pro_audio.nix
./nixos_modules/sesar.nix
];
odinIntelModules = [ ./odin/configuration-intel.nix ];
odinNvidiaModules = [ ./odin/configuration-nvidia.nix ];
odinIntelBuilder = { extraModules ? [ ] }: nixpkgs.lib.nixosSystem rec {
system = "x86_64-linux";
modules =
[{ nixpkgs = nixpkgsSettings { inherit system; }; }] ++
commonBaseModules ++ odinBaseModules ++ odinIntelModules ++
(homeManagerModules { bertof = import ./odin/hm.nix; }) ++
extraModules;
};
odinNvidiaBuilder = { extraModules ? [ ] }: nixpkgs.lib.nixosSystem rec {
system = "x86_64-linux";
modules =
[{ nixpkgs = nixpkgsSettings { inherit system; }; }] ++
commonBaseModules ++ odinBaseModules ++ odinNvidiaModules ++
(homeManagerModules { bertof = import ./odin/hm.nix; }) ++
extraModules;
};
thorBaseModules = [ thorBaseModules = [
{ nixpkgs = nixpkgsSettings; }
./thor/hardware-configuration.nix ./thor/hardware-configuration.nix
nixos-hardware.nixosModules.common-cpu-amd nixos-hardware.nixosModules.common-cpu-amd
nixos-hardware.nixosModules.common-pc-ssd nixos-hardware.nixosModules.common-pc-ssd
./thor/configuration.nix ./thor/configuration.nix
] ++ commonBaseModules; ];
thorBuilder = { extraModules ? [ ] }: nixpkgs-u.lib.nixosSystem rec {
system = "x86_64-linux";
modules =
[{ nixpkgs = nixpkgsSettings { inherit system; }; }] ++
commonBaseModules ++ thorBaseModules ++
(homeManagerUModules { bertof = import ./thor/hm.nix; }) ++
extraModules;
};
lokiBaseModules = [ lokiBaseModules = [
{ nixpkgs = nixpkgsSettings; }
./loki/hardware-configuration.nix ./loki/hardware-configuration.nix
nixos-hardware.nixosModules.common-cpu-intel nixos-hardware.nixosModules.common-cpu-intel
nixos-hardware.nixosModules.common-pc-ssd nixos-hardware.nixosModules.common-pc-ssd
./loki/configuration.nix ./loki/configuration.nix
] ++ commonBaseModules; ];
lokiBuilder = { extraModules ? [ ] }: nixpkgs.lib.nixosSystem rec {
odinStable = extraModules: nixpkgs.lib.nixosSystem { system = "x86_64-linux";
inherit system; modules =
modules = odinBaseModules ++ [ [{ nixpkgs = nixpkgsSettings { inherit system; }; }] ++
home-manager.nixosModules.home-manager commonBaseModules ++ lokiBaseModules ++
homeManagerSettings (homeManagerModules { bertof = import ./loki/hm.nix; }) ++
{ home-manager.users.bertof = import ./odin/hm.nix; } extraModules;
] ++ extraModules;
}; };
odinUnstable = extraModules: unstable.lib.nixosSystem {
inherit system;
modules = odinBaseModules ++ [
home-manager-unstable.nixosModules.home-manager
homeManagerSettings
{ home-manager.users.bertof = import ./odin/hm.nix; }
] ++ extraModules;
};
thorStable = extraModules: nixpkgs.lib.nixosSystem {
inherit system;
modules = thorBaseModules ++ [
home-manager.nixosModules.home-manager
homeManagerSettings
{ home-manager.users.bertof = import ./thod/hm.nix; }
] ++ extraModules;
};
thorUnstable = extraModules: unstable.lib.nixosSystem {
inherit system;
modules = thorBaseModules ++ [
home-manager-unstable.nixosModules.home-manager
homeManagerSettings
{ home-manager.users.bertof = import ./thod/hm.nix; }
] ++ extraModules;
};
lokiUnstable = extraModules: unstable.lib.nixosSystem {
inherit system;
modules = lokiBaseModules ++ [
home-manager-unstable.nixosModules.home-manager
homeManagerSettings
{ home-manager.users.bertof = import ./loki/hm.nix; }
] ++ extraModules;
};
lokiStable = extraModules: nixpkgs.lib.nixosSystem {
inherit system;
modules = lokiBaseModules ++ [
home-manager.nixosModules.home-manager
homeManagerSettings
{ home-manager.users.bertof = import ./loki/hm.nix; }
] ++ extraModules;
};
in in
{ {
packages.${system} = unstablePkgs;
nixosConfigurations = rec { nixosConfigurations = rec {
thor = thor-unstable; thor = thorBuilder { };
thor-stable = thorStable [ ./nixos_modules/pro_audio.nix ./nixos_modules/sesar.nix ];
thor-unstable = thorUnstable [ ./nixos_modules/pro_audio.nix ./nixos_modules/sesar.nix ];
# thor-big-data = thorUnstable [ ./nixos_modules/pro_audio.nix ./nixos_modules/big_data.nix ./nixos_modules/sesar.nix ];
odin = odin-intel; odin = odin-intel;
odin-intel = odin-intel-stable; odin-intel = odinIntelBuilder { };
odin-nvidia = odin-nvidia-stable; odin-nvidia = odinNvidiaBuilder { };
odin-intel-unstable = odinUnstable [ ./odin/configuration-intel.nix ./nixos_modules/pro_audio.nix ./nixos_modules/sesar.nix ];
odin-nvidia-unstable = odinUnstable [ ./odin/configuration-nvidia.nix ./nixos_modules/pro_audio.nix ./nixos_modules/sesar.nix ];
odin-intel-stable = odinStable [ ./odin/configuration-intel.nix ./nixos_modules/pro_audio.nix ./nixos_modules/sesar.nix ];
odin-nvidia-stable = odinStable [ ./odin/configuration-nvidia.nix ./nixos_modules/pro_audio.nix ./nixos_modules/sesar.nix ];
loki = loki-stable; loki = lokiBuilder { };
loki-stable = lokiStable [ ./nixos_modules/dnsmasq.nix ]; # loki-stable = lokiStable [ ./nixos_modules/dnsmasq.nix ];
loki-k3s = lokiStable [ ./nixos_modules/k3s.nix ]; # loki-k3s = lokiStable [ ./nixos_modules/k3s.nix ];
loki-unstable = lokiUnstable [ ]; # loki-unstable = lokiUnstable [ ];
}; };
} // (flake-utils.lib.eachDefaultSystem (system: } // (flake-utils.lib.eachDefaultSystem (system: rec {
let unstablePkgs = import unstable { inherit system; overlays = overlaysBuilder system; }; packages = pkgs-u { inherit system; };
in
rec {
checks = { checks = {
pre-commit-check = pre-commit-hooks.lib.${system}.run { pre-commit-check = pre-commit-hooks.lib.${system}.run {
src = ./.; src = ./.;
@ -176,7 +150,7 @@
}; };
}; };
devShells.default = unstablePkgs.mkShell { devShells.default = packages.mkShell {
shellHook = '' shellHook = ''
${self.checks.${system}.pre-commit-check.shellHook} ${self.checks.${system}.pre-commit-check.shellHook}
''; '';

10
hm_modules/picom.nix
View file

@ -2,11 +2,19 @@
services.picom = { services.picom = {
enable = true; enable = true;
blur = true; # blur = true;
experimentalBackends = true; experimentalBackends = true;
fade = false; fade = false;
shadow = true; shadow = true;
vSync = true; vSync = true;
# settings = {
# blur =
# {
# method = "gaussian";
# size = 10;
# deviation = 7.0;
# };
# };
extraOptions = '' extraOptions = ''
blur: blur:
{ {