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

Update Thor configuration

Browse source
This commit is contained in:
Filippo Berto 2022-09-06 17:40:22 +02:00
parent 4fe22eb988
commit 4706a63b97
Signed by: bertof
GPG key ID: 9DBF7E6A1D2CE9ED
8 changed files with 33 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

2
baldur/hm.nix
View file

@ -65,4 +65,6 @@
../hm_modules/zsh.nix ../hm_modules/zsh.nix
../hm_modules/shell_aliases.nix ../hm_modules/shell_aliases.nix
]; ];
home.stateVersion = "22.05";
} }

55
flake.lock generated
View file

@ -36,27 +36,6 @@
"type": "github" "type": "github"
} }
}, },
"home-manager-u": {
"inputs": {
"nixpkgs": [
"nixpkgs-u"
],
"utils": "utils"
},
"locked": {
"lastModified": 1661573386,
"narHash": "sha256-pBEg8iY00Af/SAtU2dlmOAv+2x7kScaGlFRDjNoVJO8=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "d89bdff445eadff03fe414e9c30486bc8166b72b",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "home-manager",
"type": "github"
}
},
"nix-rice": { "nix-rice": {
"inputs": { "inputs": {
"flake-utils": [ "flake-utils": [
@ -81,11 +60,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1660407119, "lastModified": 1662458987,
"narHash": "sha256-04lWO0pDbhAXFdL4v2VzzwgxrZ5IefKn+TmZPiPeKxg=", "narHash": "sha256-hcDwRlsXZMp2Er3vQk1JEUZWhBPLVC9vTT4xHvhpcE0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "12620020f76b1b5d2b0e6fbbda831ed4f5fe56e1", "rev": "504b32caf83986b7e6b9c79c1c13008f83290f19",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -112,11 +91,11 @@
}, },
"nixpkgs-u": { "nixpkgs-u": {
"locked": { "locked": {
"lastModified": 1661628722, "lastModified": 1662019588,
"narHash": "sha256-oR/7NhG7pPkACToUtaaT6hH+rONE2z5/4NzjoUwEZt8=", "narHash": "sha256-oPEjHKGGVbBXqwwL+UjsveJzghWiWV0n9ogo1X6l4cw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "324c8aaf25b2f2027af7798e5582ce3040a793b6", "rev": "2da64a81275b68fdad38af669afeda43d401e94b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -128,11 +107,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1661309001, "lastModified": 1662435069,
"narHash": "sha256-a0CDFy+TD1/csQw+Bqdk4cT//BVAvp+A4QPYbUV9LlQ=", "narHash": "sha256-ATmHyfXFd5jKoxVD3ozcv/JhLXKKrjgVWm0+8bFLG5U=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a5c89f496b91b441f5259c29bd48b62e0d265b25", "rev": "d2f66009e5a82a8c09f10a477c9276a963dd0129",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -194,7 +173,6 @@
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"home-manager": "home-manager", "home-manager": "home-manager",
"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",
@ -225,21 +203,6 @@
"repo": "tex2nix", "repo": "tex2nix",
"type": "github" "type": "github"
} }
},
"utils": {
"locked": {
"lastModified": 1653893745,
"narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

24
flake.nix
View file

@ -9,10 +9,10 @@
}; };
nixpkgs-u.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs-u.url = "github:NixOS/nixpkgs/nixos-unstable";
home-manager-u = { # home-manager-u = {
url = "github:nix-community/home-manager"; # url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs-u"; # 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";
@ -45,7 +45,7 @@
, nixpkgs , nixpkgs
, home-manager , home-manager
, nixpkgs-u , nixpkgs-u
, home-manager-u # , home-manager-u
, flake-utils , flake-utils
, nixos-hardware , nixos-hardware
, tex2nix , tex2nix
@ -104,11 +104,11 @@
homeManagerSettings homeManagerSettings
{ home-manager.users = users; } { home-manager.users = users; }
]; ];
homeManagerUModules = users: [ # homeManagerUModules = users: [
home-manager-u.nixosModules.home-manager # home-manager-u.nixosModules.home-manager
homeManagerSettings # homeManagerSettings
{ home-manager.users = users; } # { home-manager.users = users; }
]; # ];
odinBaseModules = [ odinBaseModules = [
./odin/hardware-configuration.nix ./odin/hardware-configuration.nix
@ -147,11 +147,11 @@
./thor/configuration.nix ./thor/configuration.nix
]; ];
thorBuilder = { extraModules ? [ ] }: thorBuilder = { extraModules ? [ ] }:
nixpkgs-u.lib.nixosSystem rec { nixpkgs.lib.nixosSystem rec {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [{ nixpkgs = nixpkgsSettings { inherit system; }; }] modules = [{ nixpkgs = nixpkgsSettings { inherit system; }; }]
++ commonBaseModules ++ thorBaseModules ++ commonBaseModules ++ thorBaseModules
++ (homeManagerUModules { bertof = import ./thor/hm.nix; }) ++ (homeManagerModules { bertof = import ./thor/hm.nix; })
++ extraModules; ++ extraModules;
}; };

2
hm_modules/cava.nix
View file

@ -4,6 +4,8 @@ let
fmtString = str: "'${str}'"; fmtString = str: "'${str}'";
in in
{ {
home.packages = [ pkgs.cava ];
xdg.configFile."cava/config".text = lib.generators.toINI { } { xdg.configFile."cava/config".text = lib.generators.toINI { } {
general = { general = {
bar_width = 1; bar_width = 1;

2
loki/hm.nix
View file

@ -65,4 +65,6 @@
../hm_modules/zsh.nix ../hm_modules/zsh.nix
../hm_modules/shell_aliases.nix ../hm_modules/shell_aliases.nix
]; ];
home.stateVersion = "21.11";
} }

2
odin/hm.nix
View file

@ -166,4 +166,6 @@
../hm_modules/xidlehook.nix ../hm_modules/xidlehook.nix
../hm_modules/zathura.nix ../hm_modules/zathura.nix
]; ];
home.stateVersion = "21.11";
} }

1
thor/configuration.nix
View file

@ -31,6 +31,7 @@ with lib; {
}; };
hardware = { hardware = {
opengl.enable = true;
bluetooth.enable = true; bluetooth.enable = true;
enableRedistributableFirmware = true; enableRedistributableFirmware = true;
pulseaudio.enable = false; pulseaudio.enable = false;

4
thor/hm.nix
View file

@ -13,7 +13,6 @@
bitwarden bitwarden
btop btop
catgirl # IRC catgirl # IRC
cava
discord discord
docker-compose docker-compose
docker-machine docker-machine
@ -97,6 +96,7 @@
../hm_modules/alacritty.nix ../hm_modules/alacritty.nix
../hm_modules/autorandr.nix ../hm_modules/autorandr.nix
../hm_modules/bspwm.nix ../hm_modules/bspwm.nix
../hm_modules/cava.nix
../hm_modules/easyeffects.nix ../hm_modules/easyeffects.nix
../hm_modules/dunst.nix ../hm_modules/dunst.nix
# ../hm_modules/grobi.nix # ../hm_modules/grobi.nix
@ -132,4 +132,6 @@
../hm_modules/xidlehook.nix ../hm_modules/xidlehook.nix
../hm_modules/zathura.nix ../hm_modules/zathura.nix
]; ];
home.stateVersion = "21.05";
} }