erwin/nixos-config
1
0
Fork 0
Code Issues 1 Pull requests Projects 1 Releases Wiki Activity Actions

Compare commits

base: erwin:f41fc22c78db95e416acfe9e9a0b34ff3c97442f
Branches Tags
erwin:main
...
compare: erwin:53894f494ab5ed78e872832e6f295d98902f0ea2
Branches Tags
erwin:main

4 commits
f41fc22c78 ... 53894f494a

Author SHA1 Message Date
Erwin Boskma
53894f494a
mimir: Remove attic imports, network shenanigans 2024-10-23 16:24:37 +02:00
Erwin Boskma
19415ddf40
waybar: Add profile option 2024-10-23 16:24:32 +02:00
Erwin Boskma
488637ff4b
firefox: gfx.webrender.all is not necessary anymore 2024-10-23 16:23:44 +02:00
Erwin Boskma
464b987af3
flake.lock: Update 
Flake lock file updates:

• Updated input 'disko':
    'github:nix-community/disko/a6a3179ddf396dfc28a078e2f169354d0c137125?narHash=sha256-MuojlSnwAJAwfhgmW8ZtZrwm2Sko4fqubCvReqbUzYw%3D' (2024-10-18)
  → 'github:nix-community/disko/4be2aadf13b67ffbb993deb73adff77c46b728fc?narHash=sha256-PNONdMd%2BsG7JWzNIDerX7oVZXL8FTVlSAZ1BmUo2HjE%3D' (2024-10-22)
• Updated input 'emacs-overlay':
    'github:nix-community/emacs-overlay/5d488eec63742aca43fb57a6f805ef282294f3a4?narHash=sha256-GCrI052UegxjdNRKfV6JSrn4pbJb7SsbuEOXCYxfLm4%3D' (2024-10-21)
  → 'github:nix-community/emacs-overlay/dd66a43b14c37c5461bdc4324be3fd32e720c996?narHash=sha256-wwkldM3Ru%2B3aBBibjYi4MskJzkA7BM3YhL/m3a0x58k%3D' (2024-10-22)
• Updated input 'emacs-overlay/nixpkgs-stable':
    'github:NixOS/nixpkgs/4eb33fe664af7b41a4c446f87d20c9a0a6321fa3?narHash=sha256-LDiPhQ3l%2BfBjRATNtnuDZsBS7hqoBtPkKBkhpoBHv3I%3D' (2024-10-17)
  → 'github:NixOS/nixpkgs/a9b86fc2290b69375c5542b622088eb6eca2a7c3?narHash=sha256-QUvb6epgKi9pCu9CttRQW4y5NqJ%2BsnKr1FZpG/x3Wtc%3D' (2024-10-19)
• Updated input 'home-manager':
    'github:nix-community/home-manager/1e27f213d77fc842603628bcf2df6681d7d08f7e?narHash=sha256-gBOVJv%2Bq6Mx8jGvwX7cE6J8%2BsZmi1uxpRVsO7WxvVuQ%3D' (2024-10-20)
  → 'github:nix-community/home-manager/5ec753a1fc4454df9285d8b3ec0809234defb975?narHash=sha256-7LAGY32Xl14OVQp3y6M43/0AtHYYvV6pdyBcp3eoz0s%3D' (2024-10-21)
• Updated input 'nixos-hardware':
    'github:NixOS/nixos-hardware/9fcf30fccf8435f6390efec4a4d38e69c2268a36?narHash=sha256-THqzn/7um3oMHUEGXyq%2B1CJQE7EogwR3HjLMNOlhFBE%3D' (2024-10-20)
  → 'github:NixOS/nixos-hardware/cc2d3c0e060f981905d52337340ee6ec8b8eb037?narHash=sha256-8OHgqz%2BtFo21h3hg4/GHizFPws%2BMMzpEru/%2B62Z0E8c%3D' (2024-10-21)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0?narHash=sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c%2BcHUJwA%3D' (2024-10-18)
  → 'github:nixos/nixpkgs/1997e4aa514312c1af7e2bda7fad1644e778ff26?narHash=sha256-I4tuhRpZFa6Fu6dcH9Dlo5LlH17peT79vx1y1SpeKt0%3D' (2024-10-20)
• Updated input 'rust-overlay':
    'github:oxalica/rust-overlay/ada8266712449c4c0e6ee6fcbc442b3c217c79e1?narHash=sha256-r0VyeJxy4O4CgTB/PNtfQft9fPfN1VuGvnZiCxDArvg%3D' (2024-10-21)
  → 'github:oxalica/rust-overlay/d687672b4541496408068bc273d94c643005d4c9?narHash=sha256-dP764PQ6YhjY7C84Txnrb2vf0H2YdQlp5c6a7G18fgw%3D' (2024-10-22)
• Updated input 'sops':
    'github:Mic92/sops-nix/c504fd7ac946d7a1b17944d73b261ca0a0b226a5?narHash=sha256-fADlzOzcSaGsrO%2BTHUZ8SgckMMc7bMQftztKFCLVcFI%3D' (2024-10-20)
  → 'github:Mic92/sops-nix/26642e8f193f547e72d38cd4c0c4e45b49236d27?narHash=sha256-YOc4033a/j1TbdLfkaSOSX2SrvlmuM%2BenIFoveNTCz4%3D' (2024-10-22)
 2024-10-22 14:35:43 +02:00
5 changed files with 43 additions and 32 deletions
Show stats Expand all files Collapse all files

48
flake.lock
View file

@ -193,11 +193,11 @@
]
},
"locked": {
"lastModified": 1729281548,
"narHash": "sha256-MuojlSnwAJAwfhgmW8ZtZrwm2Sko4fqubCvReqbUzYw=",
"lastModified": 1729588208,
"narHash": "sha256-PNONdMd+sG7JWzNIDerX7oVZXL8FTVlSAZ1BmUo2HjE=",
"owner": "nix-community",
"repo": "disko",
"rev": "a6a3179ddf396dfc28a078e2f169354d0c137125",
"rev": "4be2aadf13b67ffbb993deb73adff77c46b728fc",
"type": "github"
},
"original": {
@ -217,11 +217,11 @@
"nixpkgs-stable": "nixpkgs-stable_2"
},
"locked": {
"lastModified": 1729476442,
"narHash": "sha256-GCrI052UegxjdNRKfV6JSrn4pbJb7SsbuEOXCYxfLm4=",
"lastModified": 1729588452,
"narHash": "sha256-wwkldM3Ru+3aBBibjYi4MskJzkA7BM3YhL/m3a0x58k=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "5d488eec63742aca43fb57a6f805ef282294f3a4",
"rev": "dd66a43b14c37c5461bdc4324be3fd32e720c996",
"type": "github"
},
"original": {
@ -517,11 +517,11 @@
]
},
"locked": {
"lastModified": 1729459288,
"narHash": "sha256-gBOVJv+q6Mx8jGvwX7cE6J8+sZmi1uxpRVsO7WxvVuQ=",
"lastModified": 1729551526,
"narHash": "sha256-7LAGY32Xl14OVQp3y6M43/0AtHYYvV6pdyBcp3eoz0s=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "1e27f213d77fc842603628bcf2df6681d7d08f7e",
"rev": "5ec753a1fc4454df9285d8b3ec0809234defb975",
"type": "github"
},
"original": {
@ -617,11 +617,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1729455275,
"narHash": "sha256-THqzn/7um3oMHUEGXyq+1CJQE7EogwR3HjLMNOlhFBE=",
"lastModified": 1729509737,
"narHash": "sha256-8OHgqz+tFo21h3hg4/GHizFPws+MMzpEru/+62Z0E8c=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "9fcf30fccf8435f6390efec4a4d38e69c2268a36",
"rev": "cc2d3c0e060f981905d52337340ee6ec8b8eb037",
"type": "github"
},
"original": {
@ -676,11 +676,11 @@
},
"nixpkgs-stable_2": {
"locked": {
"lastModified": 1729181673,
"narHash": "sha256-LDiPhQ3l+fBjRATNtnuDZsBS7hqoBtPkKBkhpoBHv3I=",
"lastModified": 1729307008,
"narHash": "sha256-QUvb6epgKi9pCu9CttRQW4y5NqJ+snKr1FZpG/x3Wtc=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "4eb33fe664af7b41a4c446f87d20c9a0a6321fa3",
"rev": "a9b86fc2290b69375c5542b622088eb6eca2a7c3",
"type": "github"
},
"original": {
@ -724,11 +724,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1729256560,
"narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=",
"lastModified": 1729413321,
"narHash": "sha256-I4tuhRpZFa6Fu6dcH9Dlo5LlH17peT79vx1y1SpeKt0=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0",
"rev": "1997e4aa514312c1af7e2bda7fad1644e778ff26",
"type": "github"
},
"original": {
@ -823,11 +823,11 @@
]
},
"locked": {
"lastModified": 1729477859,
"narHash": "sha256-r0VyeJxy4O4CgTB/PNtfQft9fPfN1VuGvnZiCxDArvg=",
"lastModified": 1729564184,
"narHash": "sha256-dP764PQ6YhjY7C84Txnrb2vf0H2YdQlp5c6a7G18fgw=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "ada8266712449c4c0e6ee6fcbc442b3c217c79e1",
"rev": "d687672b4541496408068bc273d94c643005d4c9",
"type": "github"
},
"original": {
@ -844,11 +844,11 @@
"nixpkgs-stable": "nixpkgs-stable_4"
},
"locked": {
"lastModified": 1729394972,
"narHash": "sha256-fADlzOzcSaGsrO+THUZ8SgckMMc7bMQftztKFCLVcFI=",
"lastModified": 1729587807,
"narHash": "sha256-YOc4033a/j1TbdLfkaSOSX2SrvlmuM+enIFoveNTCz4=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "c504fd7ac946d7a1b17944d73b261ca0a0b226a5",
"rev": "26642e8f193f547e72d38cd4c0c4e45b49236d27",
"type": "github"
},
"original": {

5
home-manager/modules/firefox/default.nix
View file

@ -27,7 +27,6 @@ let
"experiments.manifest.uri" = "";
"experiments.supported" = false;
"extensions.quarantinedDomains.enabled" = false;
"gfx.webrender.all" = true;
"image.avif.enabled" = true;
"image.webp.enabled" = true;
"media.ffmpeg.vaapi.enabled" = true;
@ -125,6 +124,8 @@ in
};
};
home.packages = [ nonDefaultDesktop ];
home.packages = [
nonDefaultDesktop
];
};
}

12
home-manager/modules/waybar/default.nix
View file

@ -13,6 +13,14 @@ in
enable = mkEnableOption "Enable waybar";
sway = mkEnableOption "sway";
river = mkEnableOption "river";
profile = mkOption {
description = "";
type = types.enum [
"home"
"work"
];
default = "home";
};
cpuTempPath = mkOption {
description = "The path to the CPU temperature sensor in sysfs";
@ -41,8 +49,10 @@ in
"sway/workspaces"
"sway/mode"
]
++ [ "custom/now_playing" ];
++ lib.optional (cfg.profile == "home") "custom/now_playing";
modules-center = (lib.optional cfg.sway "sway/window") ++ (lib.optional cfg.river "river/window");
modules-right = [
"network"
"memory"

9
machines/mimir/configuration.nix
View file

@ -1,6 +1,5 @@
{
nixos-hardware,
attic,
...
}:
{ pkgs, config, ... }:
@ -11,8 +10,6 @@
nixos-hardware.nixosModules.common-cpu-amd-pstate
nixos-hardware.nixosModules.common-pc-ssd
attic.nixosModules.atticd
../../users/erwin
../../users/root
];
@ -209,7 +206,6 @@
firewall = {
trustedInterfaces = [
"lo"
"tailscale0"
"enp5s0f1"
];
@ -310,7 +306,10 @@
Name = "enp5s0f1";
};
addresses = [ { Address = "10.42.0.1/24"; } ];
addresses = [
{ Address = "10.42.0.1/24"; }
{ Address = "192.168.42.10/24"; }
];
};
};
};

1
users/erwin/work.nix
View file

@ -167,6 +167,7 @@ in
waybar = {
enable = true;
sway = true;
profile = "work";
cpuTempPath = "/sys/class/hwmon/hwmon1/temp2_input";
};
};