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

Compare commits

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

No commits in common. "53894f494ab5ed78e872832e6f295d98902f0ea2" and "f41fc22c78db95e416acfe9e9a0b34ff3c97442f" have entirely different histories.
53894f494a ... f41fc22c78

5 changed files with 32 additions and 43 deletions
Show stats Expand all files Collapse all files

48
flake.lock
View file

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

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

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

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

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

9
machines/mimir/configuration.nix
View file

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

1
users/erwin/work.nix
View file

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