Compare commits

...
16 Commits
9 changed files with 111 additions and 120 deletions
Generated
+42 -65
View File
@@ -25,11 +25,11 @@
}, },
"crane": { "crane": {
"locked": { "locked": {
"lastModified": 1781825982, "lastModified": 1784564969,
"narHash": "sha256-SlXKwIRIhrOSAcTjCB3ftPLzJWZStQIPS7J1FlZPnKk=", "narHash": "sha256-TkTWNhJV/8Wk3czlbz4bwHZkFCaCHPsOy+oJe4PUiXg=",
"owner": "ipetkov", "owner": "ipetkov",
"repo": "crane", "repo": "crane",
"rev": "469fd08d0bcf6926321fa973c6777fbc87785dd7", "rev": "7930f6c291de6f83c257839d434592aa085f290a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -76,28 +76,6 @@
"type": "github" "type": "github"
} }
}, },
"gitignore": {
"inputs": {
"nixpkgs": [
"lanzaboote",
"pre-commit",
"nixpkgs"
]
},
"locked": {
"lastModified": 1709087332,
"narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
"owner": "hercules-ci",
"repo": "gitignore.nix",
"rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "gitignore.nix",
"type": "github"
}
},
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@@ -126,11 +104,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1782657028, "lastModified": 1785531816,
"narHash": "sha256-PHTCpYZCMzJYS3phhywqRAZphKVr2zjvlGYa+H20ZZ4=", "narHash": "sha256-vkMnV0JIyw+g/NmcfoajlGaAO+9a0ezia+FZohQJrik=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "4ad9aaae70c9aaab504127f926c0fa9cfbc2b365", "rev": "bf9ce9fec78f95f374e8dd3b503863a3ec128ebe",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -146,11 +124,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1781981105, "lastModified": 1785119570,
"narHash": "sha256-/1nNBbA7PrSQpTc9Qazkhl4kIPg+TNl0CjxS3UQJKlw=", "narHash": "sha256-Rgs2xKnGLFWQscxUaXX07oyZeuMDOHEbqDOsgliLFGM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "7bfff44b465909f69a442701293bc0badcf476dc", "rev": "d4fd24667c8cbef124bb70a20380cab75ec8474d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -208,11 +186,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1782376208, "lastModified": 1785525178,
"narHash": "sha256-2TEHO71k+Y258zxBJ5Djs6hf7/iQ4zxhCATwJcVKTfU=", "narHash": "sha256-yi6t4hwuPthRfQVen+8W+KLsaRinfi9CnhSJR+cqaDo=",
"owner": "Jovian-Experiments", "owner": "Jovian-Experiments",
"repo": "Jovian-NixOS", "repo": "Jovian-NixOS",
"rev": "f56f00397f50a58fae1cf7f32781a70852692e66", "rev": "54e924706bd63d46a5b45c3ab6a4bc5e5e3acb3e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -231,11 +209,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1782160136, "lastModified": 1785452604,
"narHash": "sha256-APwmLI4UuSTim0JO/kZ6FXDPiZVp3zIj0uGDF2UZ5kU=", "narHash": "sha256-d0NKOOtI90kk8DAXNDkgYUZD8KK908bczz6zNLTC/zw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "lanzaboote", "repo": "lanzaboote",
"rev": "6650fb7c6b48177c8200e21ffac99a4adc72b08d", "rev": "c191775376b8734af02970153b4e5d86841dff19",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -253,11 +231,11 @@
"spectrum": "spectrum" "spectrum": "spectrum"
}, },
"locked": { "locked": {
"lastModified": 1782324740, "lastModified": 1785510331,
"narHash": "sha256-EpaYlgijQUv8nvbhMStQEFoO7aDWxJmVTOlsoHWqHpg=", "narHash": "sha256-d/AR1r5guAk52ZWM0sAd3O8Fd2jQbyGwxU+e6flTiUk=",
"owner": "microvm-nix", "owner": "microvm-nix",
"repo": "microvm.nix", "repo": "microvm.nix",
"rev": "49a3e9fe33d33f189d24dafca36096766faa60ad", "rev": "06544a68599a0e0721760af442000204e57e3937",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -293,11 +271,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1782562157, "lastModified": 1785232496,
"narHash": "sha256-a7+T6QSeowynwZ1ZJJbP8T8ntAytvrui8kFGJmIZt2c=", "narHash": "sha256-65EQYIRRpTdpH8lUiB6Mvo5uBkG60aBIzAJuALfx+O0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "a9cf7546a938c737b079e738de73934a13de9784", "rev": "2e790b0a6be8ec2b76174ac0931b8ff11919ec98",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -325,11 +303,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1782467914, "lastModified": 1785454630,
"narHash": "sha256-pGvFkM8N0xEkIIXDe5YYfbEAvHrk4IxBrjB/x8OomhE=", "narHash": "sha256-LQy14TZp77TwbQf40gg1V3jo8FwJG0jGDkAH+zRHqg8=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e73de5be04e0eff4190a1432b946d469c794e7b4", "rev": "1559d3daa3ecc813a650b79375ea61b6741b8746",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -354,11 +332,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1782535326, "lastModified": 1785491804,
"narHash": "sha256-ZeRxu4yn6shd3SNF5ZUQb4r7BaVo1zBKMjRhfoNSBmw=", "narHash": "sha256-p00vplVOyfKGlhju0+eGGPAxyYYKaY0lpyuoHLFIx2Y=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "714a5f8c4ead6b31148d829288440ed033ccc041", "rev": "5b4f72e1705a63aace42900610c4db82cb4af0ec",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -376,11 +354,11 @@
"noctalia-qs": "noctalia-qs" "noctalia-qs": "noctalia-qs"
}, },
"locked": { "locked": {
"lastModified": 1780949817, "lastModified": 1783017890,
"narHash": "sha256-2oJuPyt+4dd+ZzO7TFqpmkSAAYpRg9SF4eV8kJGl6Tk=", "narHash": "sha256-bAzrtN0GDMH0dOZkgeI3zSxfFs2rdD3pMuzOxvTF0bs=",
"owner": "noctalia-dev", "owner": "noctalia-dev",
"repo": "noctalia", "repo": "noctalia",
"rev": "f816591afc2f2f606d1f0cf70b51e95c04a7a8aa", "rev": "a48885b9fec485c903c955749a7da6e30147cd38",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -416,23 +394,22 @@
"pre-commit": { "pre-commit": {
"inputs": { "inputs": {
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"gitignore": "gitignore",
"nixpkgs": [ "nixpkgs": [
"lanzaboote", "lanzaboote",
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1781733627, "lastModified": 1784288435,
"narHash": "sha256-U3yTuGBnmXvXoQI3qkpfEDsn9RovQPAjN7ndRco+3u0=", "narHash": "sha256-ReRHaLgr/uVqdD8afFSn+myXIfpHeOhP0yYe0TJqAA8=",
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "git-hooks.nix",
"rev": "3bbec39bc90eadfa031e6f3b77272f3f60803e39", "rev": "43b3c1ab9d40fb1dbb008f451988a91e375825e9",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "git-hooks.nix",
"type": "github" "type": "github"
} }
}, },
@@ -459,11 +436,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1782012058, "lastModified": 1785044261,
"narHash": "sha256-9mWUnReOUXfKjZuJAL/bAFH3LUyECTRtXgSNVjRw3UY=", "narHash": "sha256-ehF/c4fLdgmNu7YXEClnmwhoBYddhYIVoSQpsZoorC4=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "8534567325bd8a8d2928e6afd81e0a87d19efd3c", "rev": "fe2124391e739e7b3e8720cd8a73f06edd0aceba",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -475,11 +452,11 @@
"spectrum": { "spectrum": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1778940603, "lastModified": 1783694892,
"narHash": "sha256-voSM8dZNlaOWN3kbYFky+FNY6fFQOEw0xF+ZMpZKkCQ=", "narHash": "sha256-xO8f7Qng+18FK2UlB9vcrkxCaQMCt5WjCH24aW/11eg=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "367dd227f539267eae2b62770b4c17b88ac8c1f1", "rev": "24c4346e30fdea8d8e80f34aec3554a15a667d24",
"revCount": 1265, "revCount": 1410,
"type": "git", "type": "git",
"url": "https://spectrum-os.org/git/spectrum" "url": "https://spectrum-os.org/git/spectrum"
}, },
-1
View File
@@ -77,7 +77,6 @@
unzip # Zip files unzip # Zip files
unrar # Rar files unrar # Rar files
papirus-icon-theme papirus-icon-theme
arc-theme
# General configuration # General configuration
#keepassxc #keepassxc
+25 -8
View File
@@ -115,6 +115,9 @@
tuned = { tuned = {
enable = true; enable = true;
ppdSettings.battery = {
balanced = "balanced-battery_powertop";
};
profiles = { profiles = {
balanced_powertop = { balanced_powertop = {
main = { main = {
@@ -136,14 +139,28 @@
include = "balanced-battery"; include = "balanced-battery";
}; };
sysfs = { sysfs = {
"/sys/class/net/wlan0/device/power/wakeup" = "disabled"; "/sys/bus/pci/devices/0000:00:00.0/power/control" = "auto";
"/sys/bus/usb/devices/usb3/power/wakeup" = "disabled"; "/sys/bus/pci/devices/0000:00:04.0/power/control" = "auto";
"/sys/bus/usb/devices/usb1/power/wakeup" = "disabled"; "/sys/bus/pci/devices/0000:00:08.0/power/control" = "auto";
"/sys/bus/usb/devices/3-9/power/wakeup" = "disabled"; "/sys/bus/pci/devices/0000:00:12.0/power/control" = "auto";
"/sys/bus/usb/devices/usb4/power/wakeup" = "disabled"; "/sys/bus/pci/devices/0000:00:14.2/power/control" = "auto";
"/sys/bus/usb/devices/3-10/power/wakeup" = "disabled"; "/sys/bus/pci/devices/0000:00:14.3/power/control" = "auto";
"/sys/bus/usb/devices/usb2/power/wakeup" = "disabled"; "/sys/bus/pci/devices/0000:00:16.3/power/control" = "auto";
"/sys/bus/usb/devices/3-5/power/wakeup" = "disabled"; "/sys/bus/pci/devices/0000:00:1f.0/power/control" = "auto";
"/sys/bus/pci/devices/0000:00:1f.5/power/control" = "auto";
"/sys/bus/pci/devices/0000:00:1f.6/power/control" = "auto";
"/sys/bus/pci/devices/0000:55:00.0/power/control" = "auto";
"/sys/bus/usb/devices/3-10/power/wakeup" = "enabled";
"/sys/bus/usb/devices/3-3/power/control" = "auto";
"/sys/bus/usb/devices/3-5/power/control" = "auto";
"/sys/bus/usb/devices/3-5/power/wakeup" = "enabled";
"/sys/bus/usb/devices/3-9/power/wakeup" = "enabled";
"/sys/bus/usb/devices/usb1/power/wakeup" = "enabled";
"/sys/bus/usb/devices/usb2/power/wakeup" = "enabled";
"/sys/bus/usb/devices/usb3/power/wakeup" = "enabled";
"/sys/bus/usb/devices/usb4/power/wakeup" = "enabled";
"/sys/class/net/wlan0/device/power/wakeup" = "enabled";
"/sys/module/snd_hda_intel/parameters/power_save" = "1";
}; };
}; };
}; };
+4 -2
View File
@@ -20,9 +20,11 @@
myDesktop.virtualisation.enable = true; myDesktop.virtualisation.enable = true;
myDesktop.nitrokey.enable = true; myDesktop.nitrokey.enable = true;
nixpkgs.config.permittedInsecurePackages = ["pnpm-9.15.9"];
specialisation = { specialisation = {
sway.configuration = { niri.configuration = {
imports = [(import ../../modules/wm/sway)]; myDesktop.windowManager = lib.mkForce "niri";
jovian.steam.enable = lib.mkForce false; jovian.steam.enable = lib.mkForce false;
services.desktopManager.plasma6.enable = lib.mkForce false; services.desktopManager.plasma6.enable = lib.mkForce false;
}; };
+30 -15
View File
@@ -116,6 +116,31 @@ in {
description = "SSH key used for git commit signing on this host."; description = "SSH key used for git commit signing on this host.";
}; };
user = {
id = mkOption {
type = types.int;
default = 2000;
description = "User UID to set, default 2000";
};
groups = mkOption {
type = types.listOf types.str;
default = [
"wheel"
"video"
"audio"
"camera"
"networkmanager"
"lp"
"kvm"
"libvirtd"
"adb"
"dialout"
"tss"
];
description = "Groups the user is in";
};
};
extraSystemPackages = mkOption { extraSystemPackages = mkOption {
type = types.listOf types.package; type = types.listOf types.package;
default = []; default = [];
@@ -130,20 +155,8 @@ in {
{ {
users.users.${user} = { users.users.${user} = {
isNormalUser = true; isNormalUser = true;
uid = 2000; uid = cfg.user.id;
extraGroups = [ extraGroups = cfg.user.groups;
"wheel"
"video"
"audio"
"camera"
"networkmanager"
"lp"
"kvm"
"libvirtd"
"adb"
"dialout"
"tss"
];
}; };
security = { security = {
@@ -169,6 +182,8 @@ in {
ausweisapp ausweisapp
e2fsprogs e2fsprogs
orca-slicer orca-slicer
kubectl
talosctl
] ]
++ cfg.extraSystemPackages; ++ cfg.extraSystemPackages;
@@ -238,7 +253,7 @@ in {
}; };
services = { services = {
iio-niri.enable = false; iio-niri.enable = lib.mkIf (cfg.niri.hostVariant == "lifebook") true;
greetd = { greetd = {
enable = true; enable = true;
useTextGreeter = true; useTextGreeter = true;
+3
View File
@@ -9,8 +9,11 @@
enable = true; enable = true;
exports = '' exports = ''
/export 192.168.2.0/24(rw,fsid=0,no_subtree_check) /export 192.168.2.0/24(rw,fsid=0,no_subtree_check)
/export 10.10.10.2/32(ro,fsid=0,no_subtree_check)
/export/Pluto 192.168.2.0/24(rw,no_subtree_check) /export/Pluto 192.168.2.0/24(rw,no_subtree_check)
/export/Pluto 10.10.10.2/32(ro,no_subtree_check)
/export/Mars 192.168.2.0/24(rw,no_subtree_check) /export/Mars 192.168.2.0/24(rw,no_subtree_check)
/export/Mars 10.10.10.2/32(ro,no_subtree_check)
''; '';
createMountPoints = true; createMountPoints = true;
}; };
+1 -1
View File
@@ -24,7 +24,7 @@
folders = { folders = {
"Sync" = { "Sync" = {
# Name of folder in Syncthing, also the folder ID # Name of folder in Syncthing, also the folder ID
path = "/mnt/Mars/${config.services.syncthing.user}/Sync"; # Which folder to add to Syncthing path = "/mnt/Mars/Sync"; # Which folder to add to Syncthing
devices = ["hades.home.opel-online.de" "lifebook.home.opel-online.de"]; # Which devices to share the folder with devices = ["hades.home.opel-online.de" "lifebook.home.opel-online.de"]; # Which devices to share the folder with
ignorePerms = false; # By default, Syncthing doesn't sync file permissions. This line enables it for this folder. ignorePerms = false; # By default, Syncthing doesn't sync file permissions. This line enables it for this folder.
}; };
+3 -27
View File
@@ -49,12 +49,6 @@ binds {
Mod+K { focus-window-up; } Mod+K { focus-window-up; }
Mod+L { focus-column-right; } Mod+L { focus-column-right; }
// colemak-dh
//Mod+M { focus-column-left; }
//Mod+N { focus-window-down; }
//Mod+E { focus-window-up; }
//Mod+I { focus-column-right; }
Mod+Ctrl+Left { move-column-left; } Mod+Ctrl+Left { move-column-left; }
Mod+Ctrl+Down { move-window-down; } Mod+Ctrl+Down { move-window-down; }
Mod+Ctrl+Up { move-window-up; } Mod+Ctrl+Up { move-window-up; }
@@ -64,12 +58,6 @@ binds {
Mod+Ctrl+K { move-window-up; } Mod+Ctrl+K { move-window-up; }
Mod+Ctrl+L { move-column-right; } Mod+Ctrl+L { move-column-right; }
// colemak-dh
//Mod+Ctrl+M { move-column-left; }
//Mod+Ctrl+N { move-window-down; }
//Mod+Ctrl+E { move-window-up; }
//Mod+Ctrl+I { move-column-right; }
// Alternative commands that move across workspaces when reaching // Alternative commands that move across workspaces when reaching
// the first or last window in a column. // the first or last window in a column.
// Mod+J { focus-window-or-workspace-down; } // Mod+J { focus-window-or-workspace-down; }
@@ -91,12 +79,6 @@ binds {
Mod+Shift+K { focus-monitor-up; } Mod+Shift+K { focus-monitor-up; }
Mod+Shift+L { focus-monitor-right; } Mod+Shift+L { focus-monitor-right; }
//colemak-dh
//Mod+Shift+M { focus-monitor-left; }
//Mod+Shift+N { focus-monitor-down; }
//Mod+Shift+I { focus-monitor-up; }
//Mod+Shift+O { focus-monitor-right; }
Mod+Shift+Ctrl+Left { move-column-to-monitor-left; } Mod+Shift+Ctrl+Left { move-column-to-monitor-left; }
Mod+Shift+Ctrl+Down { move-column-to-monitor-down; } Mod+Shift+Ctrl+Down { move-column-to-monitor-down; }
Mod+Shift+Ctrl+Up { move-column-to-monitor-up; } Mod+Shift+Ctrl+Up { move-column-to-monitor-up; }
@@ -106,12 +88,6 @@ binds {
Mod+Shift+Ctrl+K { move-column-to-monitor-up; } Mod+Shift+Ctrl+K { move-column-to-monitor-up; }
Mod+Shift+Ctrl+L { move-column-to-monitor-right; } Mod+Shift+Ctrl+L { move-column-to-monitor-right; }
// colemak-dh
//Mod+Shift+Ctrl+M { move-column-to-monitor-left; }
//Mod+Shift+Ctrl+N { move-column-to-monitor-down; }
//Mod+Shift+Ctrl+E { move-column-to-monitor-up; }
//Mod+Shift+Ctrl+I { move-column-to-monitor-right; }
// Alternatively, there are commands to move just a single window: // Alternatively, there are commands to move just a single window:
// Mod+Shift+Ctrl+Left { move-window-to-monitor-left; } // Mod+Shift+Ctrl+Left { move-window-to-monitor-left; }
// ... // ...
@@ -123,11 +99,11 @@ binds {
Mod+Page_Down { focus-workspace-down; } Mod+Page_Down { focus-workspace-down; }
Mod+Page_Up { focus-workspace-up; } Mod+Page_Up { focus-workspace-up; }
Mod+U { focus-workspace-down; } Mod+U { focus-workspace-down; }
//Mod+I { focus-workspace-up; } Mod+I { focus-workspace-up; }
Mod+Ctrl+Page_Down { move-column-to-workspace-down; } Mod+Ctrl+Page_Down { move-column-to-workspace-down; }
Mod+Ctrl+Page_Up { move-column-to-workspace-up; } Mod+Ctrl+Page_Up { move-column-to-workspace-up; }
Mod+Ctrl+U { move-column-to-workspace-down; } Mod+Ctrl+U { move-column-to-workspace-down; }
//Mod+Ctrl+I { move-column-to-workspace-up; } Mod+Ctrl+I { move-column-to-workspace-up; }
// Alternatively, there are commands to move just a single window: // Alternatively, there are commands to move just a single window:
// Mod+Ctrl+Page_Down { move-window-to-workspace-down; } // Mod+Ctrl+Page_Down { move-window-to-workspace-down; }
@@ -136,7 +112,7 @@ binds {
Mod+Shift+Page_Down { move-workspace-down; } Mod+Shift+Page_Down { move-workspace-down; }
Mod+Shift+Page_Up { move-workspace-up; } Mod+Shift+Page_Up { move-workspace-up; }
Mod+Shift+U { move-workspace-down; } Mod+Shift+U { move-workspace-down; }
//Mod+Shift+I { move-workspace-up; } Mod+Shift+I { move-workspace-up; }
Mod+WheelScrollDown cooldown-ms=150 { focus-workspace-down; } Mod+WheelScrollDown cooldown-ms=150 { focus-workspace-down; }
Mod+WheelScrollUp cooldown-ms=150 { focus-workspace-up; } Mod+WheelScrollUp cooldown-ms=150 { focus-workspace-up; }
+2
View File
@@ -35,6 +35,8 @@
decky-loader.enable = true; decky-loader.enable = true;
}; };
nixpkgs.config.permittedInsecurePackages = ["pnpm-9.15.9"];
hardware.graphics = { hardware.graphics = {
enable = true; enable = true;
enable32Bit = true; enable32Bit = true;