Compare commits

...

11 Commits

19 changed files with 156 additions and 40 deletions
Generated
+27 -27
View File
@@ -98,11 +98,11 @@
}, },
"flake-file": { "flake-file": {
"locked": { "locked": {
"lastModified": 1775848911, "lastModified": 1777679829,
"narHash": "sha256-dqva/tlWxsXj32wYPdt06UrrR4l2QdK9JWyvPooWRi4=", "narHash": "sha256-zQxY90pq7BDbeimAiOfuK2U0huzo6oHOiC8zEpRgsbQ=",
"owner": "vic", "owner": "vic",
"repo": "flake-file", "repo": "flake-file",
"rev": "b36cbd5fc01e9794a001ccb0c58b314efaabae08", "rev": "04ca28cf570276e70a9a5f694791ab2a60f1f300",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -116,11 +116,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1775087534, "lastModified": 1777988971,
"narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=", "narHash": "sha256-qIoWPDs+0/8JecyYgE3gpKQxW/4bLW/gp45vow9ioCQ=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b", "rev": "0678d8986be1661af6bb555f3489f2fdfc31f6ff",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -175,11 +175,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1775425411, "lastModified": 1777851538,
"narHash": "sha256-KY6HsebJHEe5nHOWP7ur09mb0drGxYSzE3rQxy62rJo=", "narHash": "sha256-Gp8qwTEYNoy2yvmErVGlvLOQvrtEECCAKbonW7VJef8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "0d02ec1d0a05f88ef9e74b516842900c41f0f2fe", "rev": "cc09c0f9b7eaa95c2d9827338a5eb03d32505ca5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -234,11 +234,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1775811116, "lastModified": 1778003029,
"narHash": "sha256-t+HZK42pB6N+i5RGbuy7Xluez/VvWbembBdvzsc23Ss=", "narHash": "sha256-q/nkKLDtHIyLjZpKhWk3cSK5IYsFqtMd6UtXF3ddjgA=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "54170c54449ea4d6725efd30d719c5e505f1c10e", "rev": "0c88e1f2bdb93d5999019e99cb0e61e1fe2af4c5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -250,11 +250,11 @@
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"lastModified": 1774748309, "lastModified": 1777168982,
"narHash": "sha256-+U7gF3qxzwD5TZuANzZPeJTZRHS29OFQgkQ2kiTJBIQ=", "narHash": "sha256-GOkGPcboWE9BmGCRMLX3worL4EMnsnG8MyKmXNeYuhQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs.lib", "repo": "nixpkgs.lib",
"rev": "333c4e0545a6da976206c74db8773a1645b5870a", "rev": "f5901329dade4a6ea039af1433fb087bd9c1fe14",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -265,11 +265,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1775710090, "lastModified": 1777954456,
"narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=", "narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4c1018dae018162ec878d42fec712642d214fdfa", "rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -369,11 +369,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1776050130, "lastModified": 1778037418,
"narHash": "sha256-/f/6/1WOfBJaGMfqV3VxWD9lpFRbPpF+Cx4MO+0mGok=", "narHash": "sha256-EZnAOkPgEeOO2rCRhwkTvesCq/E6dbsyxhMyaefgIWM=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "3c27f4c92a7d977556dd2c10bb564d9c61b375e9", "rev": "adf987c76af8d17b8256d23631bcf203f81e1a63",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -402,11 +402,11 @@
"systems": "systems_4" "systems": "systems_4"
}, },
"locked": { "locked": {
"lastModified": 1775421933, "lastModified": 1777789800,
"narHash": "sha256-JkEbzFDFTsUlVtHEzA8Y4r3O9LInhb96eOCbtGjGnbM=", "narHash": "sha256-XHCvLGu/bEEZRzXVKFu1i+2YB102Nr00n8e7xrzsfVs=",
"owner": "Gerg-L", "owner": "Gerg-L",
"repo": "spicetify-nix", "repo": "spicetify-nix",
"rev": "ec8d73085fdf807d55765335dc8126e14e7b2096", "rev": "d0e921cc48aab6137d203a3eab19601dc2bdc0c3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -482,11 +482,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1775710180, "lastModified": 1777612697,
"narHash": "sha256-sCokvdNvl8zIzsnjgG0TN5h3RUI7GJyWW9ErfmEj0rM=", "narHash": "sha256-h+tXBNMDrsKbD1UnYw0IeSIT4RalHtIJ1GLOviib7/8=",
"owner": "youwen5", "owner": "youwen5",
"repo": "zen-browser-flake", "repo": "zen-browser-flake",
"rev": "2c138beb648d1cbbfae76695a8230ee04e4db25a", "rev": "f9f70d14f9a57c7962c5cfe589461c1391044448",
"type": "github" "type": "github"
}, },
"original": { "original": {
+19
View File
@@ -0,0 +1,19 @@
{ self
, inputs
, ...
}: {
flake.modules.nixos.keith = { config, ... }: {
age.secrets.upsmon.file = "${inputs.secrets}/upsmon.age";
imports = with self.factory; [
(nut-client {
buggie = {
type = "slave";
passwordFile = config.age.secrets.upsmon.path;
system = "main-ups@buggie.veltnet";
user = "observer";
};
})
];
};
}
@@ -6,7 +6,7 @@
(mount-cifs { (mount-cifs {
host = "duke.veltnet"; host = "duke.veltnet";
resource = "smb-share"; resource = "smb-share";
destination = "/home/weckyy702/duke"; destination = "/mnt/duke";
credentials_path = "${config.age.secrets.nas-creds.path}"; credentials_path = "${config.age.secrets.nas-creds.path}";
UID = "weckyy702"; UID = "weckyy702";
GID = "users"; GID = "users";
+6
View File
@@ -3,6 +3,12 @@
imports = with inputs.self.modules.nixos; imports = with inputs.self.modules.nixos;
with inputs.self.factory; [ with inputs.self.factory; [
development-tools development-tools
rust-dev
udev
udev-pio
udev-lauterbach
docker docker
]; ];
}; };
+2 -1
View File
@@ -6,13 +6,14 @@
systemd-boot systemd-boot
bluetooth bluetooth
i18n-de i18n-de
powermanagement
(autologin "weckyy702") (autologin "weckyy702")
home-vpn home-vpn
opentablet opentablet
#TODO: laptop specific aspects like powertop appimage
]; ];
}; };
} }
@@ -16,6 +16,7 @@
randomized-aghpb-wallpaper randomized-aghpb-wallpaper
nm-applet nm-applet
blueman-applet blueman-applet
prusa-slicer
]; ];
}; };
}; };
+8
View File
@@ -0,0 +1,8 @@
{
flake.modules.nixos.appimage = { pkgs, ...}: {
programs.appimage = {
enable = true;
binfmt = true;
};
};
}
+1 -1
View File
@@ -6,7 +6,7 @@
}; };
}; };
flake.modules.nixos.development-tools = { pkgs, ... }: { flake.modules.nixos.rust-dev = { pkgs, ... }: {
nixpkgs.overlays = [ nixpkgs.overlays = [
inputs.rust-overlay.overlays.default inputs.rust-overlay.overlays.default
]; ];
@@ -0,0 +1,14 @@
{
flake.modules.nixos.udev-lauterbach = {
services.udev.extraRules = ''
ACTION!="remove", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTR{idVendor}=="0897", SYMLINK+="lauterbach/trace32/%k", MODE:="0666"
ACTION!="remove", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device",ATTR{idVendor}=="8087", ATTR{idProduct}=="0a6e", MODE:="0666"
ACTION!="remove", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device",ATTR{idVendor}=="8087", ATTR{idProduct}=="0a6f", MODE:="0666"
ACTION!="remove", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device",ATTR{idVendor}=="8087", ATTR{idProduct}=="0a70", MODE:="0666"
ACTION!="remove", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device",ATTR{idVendor}=="8087", ATTR{idProduct}=="0a71", MODE:="0666"
ACTION!="remove", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device",ATTR{idVendor}=="8087", ATTR{idProduct}=="0a73", MODE:="0666"
ACTION!="remove", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device",ATTR{idVendor}=="8087", ATTR{idProduct}=="0a75", MODE:="0666"
ACTION!="remove", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device",ATTR{idVendor}=="8087", ATTR{idProduct}=="0a78", MODE:="0666"
'';
};
}
@@ -1,5 +1,5 @@
{ {
flake.modules.nixos.development-tools = { pkgs, ... }: { flake.modules.nixos.udev-pio = { pkgs, ... }: {
services.udev.packages = with pkgs; [ platformio-core.udev ]; services.udev.packages = with pkgs; [ platformio-core.udev ];
}; };
} }
@@ -0,0 +1,5 @@
{
flake.modules.nixos.udev = {
services.udev.enable = true;
};
}
@@ -21,5 +21,7 @@
which-key.enable = true; which-key.enable = true;
glow.enable = true; glow.enable = true;
fugitive.enable = true;
}; };
} }
@@ -22,6 +22,7 @@
rnix.enable = true; rnix.enable = true;
basedpyright.enable = true; basedpyright.enable = true;
emmet_ls.enable = true;
}; };
keymaps = [ keymaps = [
+16 -9
View File
@@ -1,11 +1,18 @@
{ { inputs, ... }: {
flake.modules.nixos.backlight = { flake.modules.nixos.backlight = { pkgs, ... }: {
programs.light = { environment.systemPackages = with pkgs; [
enable = true; brightnessctl
brightnessKeys = { ];
enable = true;
step = 5; home-manager.sharedModules = [
}; inputs.self.modules.homeManager.backlight
}; ];
};
flake.modules.homeManager.backlight = {
wayland.windowManager.hyprland.settings.bind = [
", code:232, exec, brightnessctl set 5%-"
", code:233, exec, brightnessctl set +5%"
];
}; };
} }
+12
View File
@@ -0,0 +1,12 @@
{
config.flake.factory.nut-client = config: {
power.ups = {
enable = true;
mode = "netclient";
upsmon = {
enable = true;
monitor = config;
};
};
};
}
+2
View File
@@ -2,6 +2,8 @@
flake.modules.nixos.tailscale = { flake.modules.nixos.tailscale = {
services.tailscale = { services.tailscale = {
enable = true; enable = true;
# required for using exit nodes
useRoutingFeatures = "client";
}; };
}; };
} }
@@ -0,0 +1,21 @@
{
flake.modules.nixos.powermanagement = {
services.auto-cpufreq.enable = true;
services.auto-cpufreq.settings = {
battery = {
governor = "powersave";
turbo = "never";
energy_perf_bias = "power";
energy_performance_preference = "power";
platform_profile = "power";
};
charger = {
governor = "performance";
turbo = "auto";
energy_perf_bias = "performance";
energy_performance_preference = "performance";
platform_profile = "performance";
};
};
};
}
+5
View File
@@ -11,4 +11,9 @@ in
publicKeys = systems ++ users; publicKeys = systems ++ users;
armor = true; armor = true;
}; };
"upsmon.age" = {
publicKeys = systems ++ users;
armor = true;
};
} }
+12
View File
@@ -0,0 +1,12 @@
-----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IFNjTWNPZyBUZWty
ZGZiS2V4b1l4d3RIck9OZUlkZnpYelUyc2Y0L3FOMzNBZ0thU1VBCjFWdC9JV0M2
YnJ6UTNRUTdPV3pYMkdJa2pRdHVYZDlJRmVmb0liTGpFSlkKLT4gc3NoLWVkMjU1
MTkgZkJwNFR3IFFvMEhYTGlLVlg5eU5jZEh4TC93ZU9NeFJ2WXlaVVIwL096cktR
V3hIeVEKK0RMczZFeFJRS0g0TWFGcG1Ic21oMzgvc0Z2NjZOSVgxc3RtVVhNcXdr
OAotPiBzc2gtZWQyNTUxOSBZazBxSWcgMXJUdGFFT2hWcWpIR1BMbkw4ZEpRcGJN
M1hETXlCVnhXeGhzR2UzdEVtdwpWdzc1aG9ZN0x5MEx6TEVLckwrakYyci9lVHJZ
V2IzQUtGcjRqUVBiRG9BCi0tLSB0dHJHRGE0b0IvQXk5ci83Sm5HQzRiY2hJV25N
MG9QazU1M0JBeUo2eWdZCvvJHo4I0ry33lbaUTowOjS3gZHoBw9v3OWNrA4QHG9M
/TRPcPZ1pjX9m9+seg==
-----END AGE ENCRYPTED FILE-----