Kabbone/nixos-config
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: Kabbone/nixos-config:876a90a0a1c431d9584ed8a242a493b2b3590cd0
Branches Tags
Kabbone/nixos-config:main Kabbone/nixos-config:refactor
..
compare: Kabbone/nixos-config:main
Branches Tags
Kabbone/nixos-config:main Kabbone/nixos-config:refactor

10 Commits
876a90a0a1 .. main

Author SHA1 Message Date
Kabbone 545e277ed5 use noctaliav4 legacy for now 2026-06-14 12:10:19 +02:00
Kabbone 3822f417ff Revert "try to update niri/noctalia config" 
This reverts commit 5466d27b98.
 2026-06-14 09:30:10 +02:00
Kabbone 5466d27b98 try to update niri/noctalia config 2026-06-13 14:24:13 +02:00
Kabbone 255145c656 flake update & fix some noctalia configs and add binary cache 2026-06-13 13:59:03 +02:00
Kabbone 5789e57378 remove old powerUp Commands and place a template if I ever go back to baremetal 2026-06-07 10:08:34 +02:00
Kabbone aa3b2d6eae flake update 2026-06-07 09:34:58 +02:00
Kabbone 73e7430c30 move back to upstream mautrix-whatsapp module 2026-06-02 20:58:13 +02:00
Kabbone 951ac9bd59 disable powerup Command on jupiter for now 2026-06-01 19:35:46 +02:00
Kabbone aa22a83853 fix changes for 26.05 update 2026-06-01 18:09:40 +02:00
Kabbone 7dba899219 rename zmkbatx 2026-06-01 17:45:01 +02:00
9 changed files with 105 additions and 101 deletions
Expand all files Collapse all files
flake.lock
Generated
+42 -41
View File
@@ -25,11 +25,11 @@
}, },
"crane": { "crane": {
"locked": { "locked": {
"lastModified": 1780099841, "lastModified": 1780532242,
"narHash": "sha256-EVZd2RsbpreRUDSi9rBwPY+ZxoyMaiEBbZxxhljbaS4=", "narHash": "sha256-D+BsdpxmtUwtqGoY0IXPhHgTlmqgcZKCEo1oMyn7ep0=",
"owner": "ipetkov", "owner": "ipetkov",
"repo": "crane", "repo": "crane",
"rev": "0532eb17955225173906d671fb36306bdeb1e2dc", "rev": "59a82a1222dd3b2080b5cc52a1a2e8d5f1b77f37",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -126,11 +126,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1780099287, "lastModified": 1781365335,
"narHash": "sha256-efIPwVGtIWIjWcznhaop6XN6HxnOL8800hF6CBNvlqQ=", "narHash": "sha256-zqDBhXMzfbdlO7F2bGHe7MOtB3xngd/+4ieMHDC+ZXo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "7d8127d308c3fb9664f7e643eec944be74ebb37d", "rev": "5b6f5733726a1b2ccafb5dec6ac4ca7299fad66c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -146,11 +146,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1779726825, "lastModified": 1781319724,
"narHash": "sha256-RUkMrREjKDQrA+dA9+xZviGAxM5W1aVdyOr/bSYpHrE=", "narHash": "sha256-ZGuxexEMo4Xv28KJ0dX/m/PHN4oZIOnxHZpNTyrvx4M=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "b179bde238977f7d4454fc770b1a727eaf55111c", "rev": "8355f0a16b2dbb06a97959a918af5b239bbe05ae",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -208,11 +208,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1780129573, "lastModified": 1781344759,
"narHash": "sha256-6/S2FvBz+dxEgPfRU7dK+ycLYzRU7L8aN+GjDRyVs/E=", "narHash": "sha256-S6UBeQM7NLaQX6RZYS65fMypWfRQL/F4iRu0y8sTLPc=",
"owner": "Jovian-Experiments", "owner": "Jovian-Experiments",
"repo": "Jovian-NixOS", "repo": "Jovian-NixOS",
"rev": "8f97d1dee8c0971b01cd6b17ccf913e8bb70f5d5", "rev": "ffac737e4117f7e9f070d38078801a5433f19d5b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -231,11 +231,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1780308674, "lastModified": 1781181476,
"narHash": "sha256-68H7z1MLdPCtWE4qetwTiMdtztZ7AwEKM9yS9Q+wZa8=", "narHash": "sha256-4JLkQvN7/f77TyxXXtoEuUfovMqMLOgWpBaLMNX1dns=",
"owner": "nix-community", "owner": "nix-community",
"repo": "lanzaboote", "repo": "lanzaboote",
"rev": "11918137828af784150f7a2da52cf50abf34f501", "rev": "0403b4b7e8b2612657f0053a4c315e6c43eee9e6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -253,11 +253,11 @@
"spectrum": "spectrum" "spectrum": "spectrum"
}, },
"locked": { "locked": {
"lastModified": 1779970379, "lastModified": 1781389237,
"narHash": "sha256-ZHsxoYXXnfJtMVh1/yY+1Eh9hHcPBhE28Qvinauh+BQ=", "narHash": "sha256-Ne1/E5XNUq0gleaQz0vW5R4xf/0h/uEZ+bOW1aNjeQk=",
"owner": "microvm-nix", "owner": "microvm-nix",
"repo": "microvm.nix", "repo": "microvm.nix",
"rev": "0d49083ba2d7419b22908ac392777c16df9a032e", "rev": "6ad601df0a07d9855c5e8f9b81135ecaf7c287eb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -293,11 +293,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1780310866, "lastModified": 1781168557,
"narHash": "sha256-fPBRVf6A5xlACYcOI59shGrjURuvwu0lRsDoSCEXt/I=", "narHash": "sha256-LOnLQ2tpYF9gqIDDr3+j3DbpJJr/QCH6zPRT2GzEUOE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "4ed851c979641e28597a05086332d75cdc9e395f", "rev": "6358ff76821101c178e3ab4919a62799bfe3652e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -325,11 +325,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1779560665, "lastModified": 1781074563,
"narHash": "sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o=", "narHash": "sha256-md8WlXOlfnIeHeOScMTTHFyf2d6iaTwPl2apR5EQ3P4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "64c08a7ca051951c8eae34e3e3cb1e202fe36786", "rev": "9ae611a455b90cf061d8f332b977e387bda8e1ca",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -354,11 +354,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1780203844, "lastModified": 1781216227,
"narHash": "sha256-K5sT4jTpGs15ADhviMKNBH38REpPf5Q6mM1+N6cArVE=", "narHash": "sha256-9mUW6gNwoN2SWc/l0fW4svPNOulXLl8ijqKyeSOGgJE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b51242d7d43689db2f3be91bd05d5b24fbb469c4", "rev": "a0374025a863d007d98e3297f6aa46cc3141c2f0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -376,16 +376,17 @@
"noctalia-qs": "noctalia-qs" "noctalia-qs": "noctalia-qs"
}, },
"locked": { "locked": {
"lastModified": 1780322768, "lastModified": 1780949817,
"narHash": "sha256-WnjyKaA+kywlyaPZs3dxD+XWVCMixsfDht8Sn7fshgs=", "narHash": "sha256-2oJuPyt+4dd+ZzO7TFqpmkSAAYpRg9SF4eV8kJGl6Tk=",
"owner": "noctalia-dev", "owner": "noctalia-dev",
"repo": "noctalia-shell", "repo": "noctalia",
"rev": "fe6fa125f5ee7881c4ee0cf9c0a4329a8238d3c2", "rev": "f816591afc2f2f606d1f0cf70b51e95c04a7a8aa",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "noctalia-dev", "owner": "noctalia-dev",
"repo": "noctalia-shell", "ref": "legacy-v4",
"repo": "noctalia",
"type": "github" "type": "github"
} }
}, },
@@ -399,11 +400,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1780194487, "lastModified": 1780799499,
"narHash": "sha256-M+YtjKCTkHrkplNaKVyaxfa8hAWjRF6wFOUBAZvxQ4U=", "narHash": "sha256-YloRtLqJabzYUWvdLyh67zH4DZrR3kQj+dlQJwLPmPM=",
"owner": "noctalia-dev", "owner": "noctalia-dev",
"repo": "noctalia-qs", "repo": "noctalia-qs",
"rev": "07398e12b54f194e3a2d47c87e3fd10b8eeaa27d", "rev": "f308426239665e3bc3d624014e9295b2ae2f58ff",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -458,11 +459,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1780284119, "lastModified": 1780802404,
"narHash": "sha256-y2wR4Mk6D/N1ID4FZa2oUMStCUxyIoRzmgOOpLzoWmo=", "narHash": "sha256-bGtIUeLb0yChX4h6hB40OOCwcYhcpQZHXSDvZGdWgeM=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "51390d0bfca0a68a8c337d215a4bbeddc2ca616e", "rev": "8e596a8430f2ce54d55c742198187d6945a5501e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -526,11 +527,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1775636079, "lastModified": 1780220602,
"narHash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0=", "narHash": "sha256-eynAfOmbmxJnkp7YewvCEbShNnnYJ9gLLqkzsYtBPeM=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "790751ff7fd3801feeaf96d7dc416a8d581265ba", "rev": "db947814a175b7ca6ded66e21383d938df01c227",
"type": "github" "type": "github"
}, },
"original": { "original": {
flake.nix
+1 -1
View File
@@ -48,7 +48,7 @@
}; };
noctalia = { noctalia = {
url = "github:noctalia-dev/noctalia-shell"; url = "github:noctalia-dev/noctalia/legacy-v4";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
}; };
hosts/jupiter/hardware-configuration.nix
+33 -25
View File
@@ -211,41 +211,52 @@
}; };
fileSystems."/export/Pluto" = { fileSystems."/export/Pluto" = {
fsType = "auto";
device = "/mnt/Pluto"; device = "/mnt/Pluto";
options = ["bind"]; options = ["bind"];
}; };
fileSystems."/export/Mars" = { fileSystems."/export/Mars" = {
fsType = "auto";
device = "/mnt/Mars"; device = "/mnt/Mars";
options = ["bind"]; options = ["bind"];
}; };
swapDevices = [{device = "/swap/swapfile";}]; swapDevices = [{device = "/swap/swapfile";}];
systemd.network = { systemd = {
enable = true; network = {
networks = { enable = true;
"10-lan" = { networks = {
matchConfig.Name = "ens18"; "10-lan" = {
ntp = ["192.168.2.1"]; matchConfig.Name = "ens18";
domains = ["home.opel-online.de"]; ntp = ["192.168.2.1"];
networkConfig = { domains = ["home.opel-online.de"];
DHCP = "yes"; networkConfig = {
IPv6AcceptRA = true; DHCP = "yes";
IPv6PrivacyExtensions = false; IPv6AcceptRA = true;
}; IPv6PrivacyExtensions = false;
ipv6AcceptRAConfig = { };
DHCPv6Client = "always"; ipv6AcceptRAConfig = {
UseDNS = true; DHCPv6Client = "always";
}; UseDNS = true;
dhcpV4Config = { };
UseDNS = true; dhcpV4Config = {
}; UseDNS = true;
dhcpV6Config = { };
UseDNS = true; dhcpV6Config = {
UseDNS = true;
};
}; };
}; };
}; };
#services.setspindown = {
# serviceConfig.Type = "oneshot";
# description = "Sets the spind down time for HDD to 12min+30sec";
# enable = true;
# wantedBy = [ "multi-user.target" ];
# script = "${pkgs.hdparm}/sbin/hdparm -S 150 /dev/disk/by-uuid/57e6446d-faca-4b67-9063-e8d9afb80088";
#};
}; };
networking = { networking = {
hostName = "jupiter"; hostName = "jupiter";
@@ -262,9 +273,6 @@
powerManagement = { powerManagement = {
cpuFreqGovernor = lib.mkDefault "powersave"; cpuFreqGovernor = lib.mkDefault "powersave";
powertop.enable = true; powertop.enable = true;
#scsiLinkPolicy = "med_power_with_dipm"; #'';
powerUpCommands = ''
${pkgs.hdparm}/sbin/hdparm -S 150 /dev/disk/by-uuid/57e6446d-faca-4b67-9063-e8d9afb80088
'';
}; };
} }
hosts/kubemaster-1/hardware-configuration.nix
-3
View File
@@ -112,9 +112,6 @@
powerManagement = { powerManagement = {
cpuFreqGovernor = lib.mkDefault "powersave"; cpuFreqGovernor = lib.mkDefault "powersave";
powertop.enable = true; powertop.enable = true;
powerUpCommands = ''
${pkgs.hdparm}/sbin/hdparm -S 150 /dev/disk/by-uuid/e036f437-bc91-4398-b182-7cf5724e23a2
'';
}; };
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
} }
hosts/nasbackup/hardware-configuration.nix
+19 -14
View File
@@ -198,19 +198,28 @@
swapDevices = [{device = "/swap/swapfile";}]; swapDevices = [{device = "/swap/swapfile";}];
systemd.network = { systemd = {
enable = true; network = {
networks = { enable = true;
"10-lan" = { networks = {
matchConfig.Name = "ens18"; "10-lan" = {
ntp = ["192.168.2.1"]; matchConfig.Name = "ens18";
domains = ["home.opel-online.de"]; ntp = ["192.168.2.1"];
networkConfig = { domains = ["home.opel-online.de"];
DHCP = "yes"; networkConfig = {
IPv6AcceptRA = true; DHCP = "yes";
IPv6AcceptRA = true;
};
}; };
}; };
}; };
# services.setspindown = {
# serviceConfig.Type = "oneshot";
# description = "Sets the spind down time for HDD to 30min";
# enable = true;
# wantedBy = [ "multi-user.target" ];
# script = "${pkgs.hdparm}/sbin/hdparm -S 150 /dev/disk/by-uuid/b9edc489-ac37-4b28-981d-442722df7ae2";
# };
}; };
networking = { networking = {
hostName = "nasbak"; hostName = "nasbak";
@@ -227,9 +236,5 @@
powerManagement = { powerManagement = {
cpuFreqGovernor = lib.mkDefault "powersave"; cpuFreqGovernor = lib.mkDefault "powersave";
powertop.enable = true; powertop.enable = true;
# powerUpCommands = ''
# ${pkgs.hdparm}/sbin/hdparm -S 150 /dev/disk/by-uuid/57e6446d-faca-4b67-9063-e8d9afb80088
# ${pkgs.hdparm}/sbin/hdparm -S 150 /dev/disk/by-uuid/b9edc489-ac37-4b28-981d-442722df7ae2
# '';
}; };
} }
modules/desktop/default.nix
+6 -3
View File
@@ -541,9 +541,12 @@ in {
# ── Laptop ───────────────────────────────────────────────────────────── # ── Laptop ─────────────────────────────────────────────────────────────
(lib.mkIf cfg.laptop.enable { (lib.mkIf cfg.laptop.enable {
systemd.sleep.extraConfig = "HibernateDelaySec=${cfg.laptop.hibernateDelaySec}"; systemd.sleep.settings.Sleep = {
services.logind.settings.Login.HandleLidSwitch = HibernateDelaySec = cfg.laptop.hibernateDelaySec;
cfg.laptop.lidSwitch; };
services.logind.settings.Login = {
HandleLidSwitch = cfg.laptop.lidSwitch;
};
}) })
# ── Nitrokey ─────────────────────────────────────────────────────────── # ── Nitrokey ───────────────────────────────────────────────────────────
modules/hardware/bluetooth.nix
+1 -1
View File
@@ -12,6 +12,6 @@
}; };
}; };
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
zmkBATx zmkbatx
]; ];
} }
modules/hardware/hydraCache.nix
+2
View File
@@ -9,11 +9,13 @@
extra-trusted-public-keys = [ extra-trusted-public-keys = [
"hades-builder:AFdPgi6Qq/yKqc2V2imgzMikEkVEFCrDaHyAmOJ3MII=" "hades-builder:AFdPgi6Qq/yKqc2V2imgzMikEkVEFCrDaHyAmOJ3MII="
"steamdeck.cachix.org-1:BVoP4TEu3ECgotaO+3J3r9SSn62GkUDBwizOFU/q4Bc=" "steamdeck.cachix.org-1:BVoP4TEu3ECgotaO+3J3r9SSn62GkUDBwizOFU/q4Bc="
"noctalia.cachix.org-1:pCOR47nnMEo5thcxNDtzWpOxNFQsBRglJzxWPp3dkU4="
]; ];
extra-substituters = [ extra-substituters = [
"https://cache.home.opel-online.de" "https://cache.home.opel-online.de"
"https://steamdeck.cachix.org" "https://steamdeck.cachix.org"
"https://cache.ci.kabtop.de" "https://cache.ci.kabtop.de"
"https://noctalia.cachix.org"
]; ];
}; };
}; };
modules/services/server/matrix.nix
+1 -13
View File
@@ -43,21 +43,9 @@ in {
return 404; return 404;
''; '';
}; };
# "element.${config.networking.domain}" = {
# enableACME = true;
# forceSSL = true;
#
# root = pkgs.element-web.override {
# conf = {
# default_server_config = clientConfig;
# };
# };
# };
}; };
}; };
imports = [../../kabbone/mautrix-whatsapp.nix];
services.matrix-synapse = { services.matrix-synapse = {
enable = true; enable = true;
settings = { settings = {
@@ -200,7 +188,7 @@ in {
}; };
}; };
}; };
kabbone_mautrix-whatsapp = { mautrix-whatsapp = {
enable = true; enable = true;
registerToSynapse = true; registerToSynapse = true;
environmentFile = config.age.secrets."services/matrix/mautrix-whatsapp.env".path; environmentFile = config.age.secrets."services/matrix/mautrix-whatsapp.env".path;