christoph/flake-nixinator
1
Fork 0
Code Activity

Compare commits

base: christoph:0b53813c9487965585d723ed3c5f65440448d1e4
Branches Tags
christoph:master
..
compare: christoph:b723322f270de8155645ec58ab6d97fd81f0c841
Branches Tags
christoph:master

5 Commits
0b53813c94 ... b723322f27

Author SHA1 Message Date
Christoph Urlacher
b723322f27 Home: System update 2025-06-01 20:25:28 +02:00
Christoph Urlacher
ec804aad31 System: Update systemd network functions 2025-06-01 20:25:18 +02:00
Christoph Urlacher
ab9873380e Lib: Update systemd network functions 2025-06-01 20:25:07 +02:00
Christoph Urlacher
d1f0b6b60f System: Disable thefuck 2025-06-01 20:24:58 +02:00
Christoph Urlacher
4c6c32a43d Flake: Update lock 2025-06-01 20:24:16 +02:00
9 changed files with 172 additions and 117 deletions
Expand all files Collapse all files

142
flake.lock generated
View File

@ -6,11 +6,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1738087375, "lastModified": 1744557573,
"narHash": "sha256-GLyNtU9A2VN22jNRHZ2OXuFfTJLh8uEVVt+ftsKUX0c=", "narHash": "sha256-XAyj0iDuI51BytJ1PwN53uLpzTDdznPDQFG4RwihlTQ=",
"owner": "Aylur", "owner": "Aylur",
"repo": "ags", "repo": "ags",
"rev": "a6a7a0adb17740f4c34a59902701870d46fbb6a4", "rev": "3ed9737bdbc8fc7a7c7ceef2165c9109f336bff6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -27,11 +27,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1737670815, "lastModified": 1742571008,
"narHash": "sha256-ZCxxshGN7XooabArcoGkYSNx5yVunqjKJi2aTv6cznI=", "narHash": "sha256-5WgfJAeBpxiKbTR/gJvxrGYfqQRge5aUDcGKmU1YZ1Q=",
"owner": "aylur", "owner": "aylur",
"repo": "astal", "repo": "astal",
"rev": "127e9cdcbf173846a3c40ddc0abfbb038df48042", "rev": "dc0e5d37abe9424c53dcbd2506a4886ffee6296e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -64,11 +64,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1742116666, "lastModified": 1748797443,
"narHash": "sha256-nxG/uGaxQjnHsxicR3RRysyDoJGsphCKmIfqbXeHgfc=", "narHash": "sha256-gmxm8VIe9MdMzzAiILXOYKIFQrHU38l42ut1pN2RWaU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "c799d9c6c955de5a698373b0ebb96daa7c8063ce", "rev": "82c5e3524420971433703790a4f3f615674d9e55",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -79,11 +79,11 @@
}, },
"flake-compat": { "flake-compat": {
"locked": { "locked": {
"lastModified": 1733328505, "lastModified": 1747046372,
"narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
"owner": "edolstra", "owner": "edolstra",
"repo": "flake-compat", "repo": "flake-compat",
"rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -100,11 +100,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1738453229, "lastModified": 1743550720,
"narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=", "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd", "rev": "c621e8422220273271f52058f618c94e405bb0f5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -154,11 +154,11 @@
}, },
"hardware": { "hardware": {
"locked": { "locked": {
"lastModified": 1741792691, "lastModified": 1748634340,
"narHash": "sha256-f0BVt1/cvA0DQ/q3rB+HY4g4tKksd03ZkzI4xehC2Ew=", "narHash": "sha256-pZH4bqbOd8S+si6UcfjHovWDiWKiIGRNRMpmRWaDIms=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "e1f12151258b12c567f456d8248e4694e9390613", "rev": "daa628a725ab4948e0e2b795e8fb6f4c3e289a7a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -174,11 +174,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1741955947, "lastModified": 1748737919,
"narHash": "sha256-2lbURKclgKqBNm7hVRtWh0A7NrdsibD0EaWhahUVhhY=", "narHash": "sha256-5kvBbLYdp+n7Ftanjcs6Nv+UO6sBhelp6MIGJ9nWmjQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "4e12151c9e014e2449e0beca2c0e9534b96a26b4", "rev": "5675a9686851d9626560052a032c4e14e533c1fa",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -201,16 +201,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1729958008, "lastModified": 1748294338,
"narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=", "narHash": "sha256-FVO01jdmUNArzBS7NmaktLdGA5qA3lUMJ4B7a05Iynw=",
"owner": "NuschtOS", "owner": "NuschtOS",
"repo": "ixx", "repo": "ixx",
"rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb", "rev": "cc5f390f7caf265461d4aab37e98d2292ebbdb85",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NuschtOS", "owner": "NuschtOS",
"ref": "v0.0.6", "ref": "v0.0.8",
"repo": "ixx", "repo": "ixx",
"type": "github" "type": "github"
} }
@ -222,11 +222,11 @@
"nixpkgs": "nixpkgs_4" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {
"lastModified": 1742038403, "lastModified": 1747908601,
"narHash": "sha256-mzZdujmFWC+wHRvm0tKUlXL0LLz3YI3EDUCnFCtzgxY=", "narHash": "sha256-cSzec5IT7Imx9g+Rhpt4GxrLiNF++V+guzYCnWUjhAI=",
"owner": "thiagokokada", "owner": "thiagokokada",
"repo": "nix-alien", "repo": "nix-alien",
"rev": "876d83ac35fc52145674282f87898824182edc48", "rev": "798541edff98cfa895941abe35f3e056f319a193",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -237,16 +237,16 @@
}, },
"nix-flatpak": { "nix-flatpak": {
"locked": { "locked": {
"lastModified": 1711997201, "lastModified": 1739444422,
"narHash": "sha256-J71xzQlVYsjagA4AsVwRazhBh2rZrPpKvxTgs6UzL7c=", "narHash": "sha256-iAVVHi7X3kWORftY+LVbRiStRnQEob2TULWyjMS6dWg=",
"owner": "gmodena", "owner": "gmodena",
"repo": "nix-flatpak", "repo": "nix-flatpak",
"rev": "b76fa31346db7fc958a9898f3c594696ca71c4fd", "rev": "5e54c3ca05a7c7d968ae1ddeabe01d2a9bc1e177",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "gmodena", "owner": "gmodena",
"ref": "v0.4.1", "ref": "latest",
"repo": "nix-flatpak", "repo": "nix-flatpak",
"type": "github" "type": "github"
} }
@ -259,11 +259,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1741619381, "lastModified": 1746934494,
"narHash": "sha256-koZtlJRqi0/MD/AKd0KrXLA2NuBOVzlIyAJprjzpxZE=", "narHash": "sha256-3n6i+F0sDASjkhbvgFDpPDZGp7z19IrRtjfF9TwJpCA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "66537fb185462ba9b07f4e6f2d54894a1b2d04ab", "rev": "e9b21b01e4307176b9718a29ac514838e7f6f4ff",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -274,11 +274,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1737469691, "lastModified": 1743583204,
"narHash": "sha256-nmKOgAU48S41dTPIXAq0AHZSehWUn6ZPrUKijHAMmIk=", "narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9e4d5190a9482a1fb9d18adf0bdb83c6e506eaab", "rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -290,11 +290,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1741862977, "lastModified": 1748421225,
"narHash": "sha256-prZ0M8vE/ghRGGZcflvxCu40ObKaB+ikn74/xQoNrGQ=", "narHash": "sha256-XXILOc80tvlvEQgYpYFnze8MkQQmp3eQxFbTzb3m/R0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "cdd2ef009676ac92b715ff26630164bb88fec4e0", "rev": "78add7b7abb61689e34fc23070a8f55e1d26185b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -322,11 +322,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1741851582, "lastModified": 1748693115,
"narHash": "sha256-cPfs8qMccim2RBgtKGF+x9IBCduRvd/N5F4nYpU0TVE=", "narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6607cf789e541e7873d40d3a8f7815ea92204f32", "rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -338,11 +338,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1741851582, "lastModified": 1747179050,
"narHash": "sha256-cPfs8qMccim2RBgtKGF+x9IBCduRvd/N5F4nYpU0TVE=", "narHash": "sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6607cf789e541e7873d40d3a8f7815ea92204f32", "rev": "adaa24fbf46737f3f1b5497bf64bae750f82942e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -354,11 +354,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1742069588, "lastModified": 1748693115,
"narHash": "sha256-C7jVfohcGzdZRF6DO+ybyG/sqpo1h6bZi9T56sxLy+k=", "narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c80f6a7e10b39afcc1894e02ef785b1ad0b0d7e5", "rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -370,11 +370,11 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1742069588, "lastModified": 1748693115,
"narHash": "sha256-C7jVfohcGzdZRF6DO+ybyG/sqpo1h6bZi9T56sxLy+k=", "narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c80f6a7e10b39afcc1894e02ef785b1ad0b0d7e5", "rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -390,14 +390,15 @@
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"nuschtosSearch": "nuschtosSearch" "nuschtosSearch": "nuschtosSearch",
"systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1741814789, "lastModified": 1748564405,
"narHash": "sha256-NbHsnnNwiYUcUaS4z8XK2tYpo3G8NXEKxaKkzMgMiLk=", "narHash": "sha256-uCmQLJmdg0gKWBs+vhNmS9RIPJW8/ddo6TvQ/a4gupc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "33097dcf776d1fad0ff3842096c4e3546312f251", "rev": "8b3a69cfea5ba2fa008c6c57ab79c99c513a349b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -413,11 +414,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1742132695, "lastModified": 1748782935,
"narHash": "sha256-c4WnLfYqLHqyhovAn0bUtHyKqDZOq+mFs4iIs4pUn6I=", "narHash": "sha256-wjo1BhHoBFzdtj92LrAonR1eJ8j5dt1YhnkPpqaam38=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "9667dea224705b76854e42961c6f4a10798adecd", "rev": "73385c8de1fac0066f513adc9a7e59d69f2327c2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -436,11 +437,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1738508923, "lastModified": 1748298102,
"narHash": "sha256-4DaDrQDAIxlWhTjH6h/+xfG05jt3qDZrZE/7zDLQaS4=", "narHash": "sha256-PP11GVwUt7F4ZZi5A5+99isuq39C59CKc5u5yVisU/U=",
"owner": "NuschtOS", "owner": "NuschtOS",
"repo": "search", "repo": "search",
"rev": "86e2038290859006e05ca7201425ea5b5de4aecb", "rev": "f8a1c221afb8b4c642ed11ac5ee6746b0fe1d32f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -478,6 +479,21 @@
"type": "github" "type": "github"
} }
}, },
"systems_2": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"treefmt-nix": { "treefmt-nix": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [

2
flake.nix
View File

@ -25,7 +25,7 @@
ags.url = "github:Aylur/ags"; ags.url = "github:Aylur/ags";
# Other # Other
nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.4.1"; nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=latest";
nix-alien.url = "github:thiagokokada/nix-alien"; nix-alien.url = "github:thiagokokada/nix-alien";
emacs-overlay.url = "github:nix-community/emacs-overlay"; emacs-overlay.url = "github:nix-community/emacs-overlay";

23
home/christoph/default.nix
View File

@ -321,7 +321,6 @@ rec {
sshfs # Mount remote directories via SSH sshfs # Mount remote directories via SSH
# GUI apps # GUI apps
ventoy-full # Bootable USB for many ISOs
signal-desktop signal-desktop
anki anki
font-manager # Previews fonts, but doesn't set them font-manager # Previews fonts, but doesn't set them
@ -481,15 +480,15 @@ rec {
yazi-plugins = pkgs.fetchFromGitHub { yazi-plugins = pkgs.fetchFromGitHub {
owner = "yazi-rs"; owner = "yazi-rs";
repo = "plugins"; repo = "plugins";
rev = "5186af7984aa8cb0550358aefe751201d7a6b5a8"; # NOTE: Refresh after system updates depending on the yazi version rev = "63f9650e522336e0010261dcd0ffb0bf114cf912"; # NOTE: Refresh after system updates depending on the yazi version
hash = "sha256-Cw5iMljJJkxOzAGjWGIlCa7gnItvBln60laFMf6PSPM="; hash = "sha256-ZCLJ6BjMAj64/zM606qxnmzl2la4dvO/F5QFicBEYfU=";
}; };
yazi-starship = pkgs.fetchFromGitHub { yazi-starship = pkgs.fetchFromGitHub {
owner = "Rolv-Apneseth"; owner = "Rolv-Apneseth";
repo = "starship.yazi"; repo = "starship.yazi";
rev = "6c639b474aabb17f5fecce18a4c97bf90b016512"; rev = "6a0f3f788971b155cbc7cec47f6f11aebbc148c9";
sha256 = "sha256-bhLUziCDnF4QDCyysRn7Az35RAy8ibZIVUzoPgyEO1A="; sha256 = "sha256-q1G0Y4JAuAv8+zckImzbRvozVn489qiYVGFQbdCxC98=";
}; };
in { in {
enable = true; enable = true;
@ -573,7 +572,7 @@ rec {
flatpak = { flatpak = {
# FlatHub stable is only added by default if no custom remotes are specified # FlatHub stable is only added by default if no custom remotes are specified
remotes = [ remotes = lib.mkOptionDefault [
{ {
name = "flathub"; name = "flathub";
location = "https://flathub.org/repo/flathub.flatpakrepo"; location = "https://flathub.org/repo/flathub.flatpakrepo";
@ -588,19 +587,18 @@ rec {
"com.github.tchx84.Flatseal" "com.github.tchx84.Flatseal"
"com.spotify.Client" "com.spotify.Client"
# "md.obsidian.Obsidian" # NOTE: Installed via package
# NOTE: Also change discord-ipc-0 below # NOTE: Also change discord-ipc-0 below
"com.discordapp.DiscordCanary" "com.discordapp.Discord"
# "com.discordapp.Discord" # "com.discordapp.DiscordCanary"
# "dev.vencord.Vesktop" # "dev.vencord.Vesktop"
# "com.google.Chrome" # "com.google.Chrome"
# "com.parsecgaming.parsec" # "md.obsidian.Obsidian" # NOTE: Installed via package
]; ];
uninstallUnmanaged = true; uninstallUnmanaged = true;
# uninstallUnused = true; # TODO: Available since 0.6.0 uninstallUnused = true; # TODO: Available since 0.6.0
update.auto = { update.auto = {
enable = true; enable = true;
@ -628,7 +626,8 @@ rec {
systemd.user.tmpfiles.rules = [ systemd.user.tmpfiles.rules = [
# Fix Discord rich presence for Flatpak # Fix Discord rich presence for Flatpak
"L %t/discord-ipc-0 - - - - app/com.discordapp.DiscordCanary/discord-ipc-0" "L %t/discord-ipc-0 - - - - app/com.discordapp.Discord/discord-ipc-0"
# "L %t/discord-ipc-0 - - - - app/com.discordapp.DiscordCanary/discord-ipc-0"
]; ];
# Nicely reload system units when changing configs # Nicely reload system units when changing configs

68
home/christoph/nixinator/default.nix
View File

@ -1,5 +1,10 @@
# Here goes the stuff that will only be enabled on the desktop # Here goes the stuff that will only be enabled on the desktop
{pkgs, ...}: { {
pkgs,
nixosConfig,
config,
...
}: {
imports = [ imports = [
../../modules ../../modules
]; ];
@ -60,24 +65,63 @@
jetbrains.pycharm-professional jetbrains.pycharm-professional
jetbrains.idea-ultimate jetbrains.idea-ultimate
jetbrains.webstorm jetbrains.webstorm
code-cursor # why not
# unityhub unityhub
# jetbrains.rider jetbrains.rider
# (with dotnetCorePackages; (with dotnetCorePackages;
# combinePackages [ combinePackages [
# sdk_6_0_1xx # sdk_6_0_1xx # Is EOL
# sdk_7_0_3xx # sdk_7_0_3xx # Is EOL
# sdk_8_0_2xx sdk_8_0_3xx
# ]) # For Rider/Unity sdk_9_0_3xx
# mono # For Rider/Unity ]) # For Rider/Unity
mono # For Rider/Unity
blender blender
# godot_4 # godot_4
obs-studio obs-studio
kdePackages.kdenlive kdePackages.kdenlive
krita krita
# makemkv makemkv
steam-devices-udev-rules
];
services = {
flatpak = {
packages = [
"com.valvesoftware.Steam"
"org.freedesktop.Platform.VulkanLayer.gamescope"
"org.freedesktop.Platform.VulkanLayer.MangoHud"
"net.davidotek.pupgui2"
"org.prismlauncher.PrismLauncher"
"com.usebottles.bottles"
"io.github.lawstorant.boxflat"
];
overrides = {
"com.valvesoftware.Steam".Context = {
filesystems = [
"${config.home.homeDirectory}/Games"
"/var/lib/flatpak/runtime/com.valvesoftware.Steam.CompatibilityTool.Proton-GE"
]; ];
}; };
"net.davidotek.pupgui2".Context = {
filesystems = [
"${config.home.homeDirectory}/.var/app/com.valvesoftware.Steam"
"${config.home.homeDirectory}/Games"
];
};
"com.usebottles.bottles".Context = {
filesystems = [
"${config.home.homeDirectory}/.var/app/com.valvesoftware.Steam"
"${config.home.homeDirectory}/Games"
];
};
};
};
};
};
} }

2
home/modules/fish/default.nix
View File

@ -194,7 +194,7 @@ in {
gcl = "git clone"; gcl = "git clone";
}) })
(abbrify pkgs.gping {ping = "gping";}) # (abbrify pkgs.gping {ping = "gping";})
(abbrify pkgs.lazygit {lg = "lazygit";}) (abbrify pkgs.lazygit {lg = "lazygit";})

29
lib/networking.nix
View File

@ -39,12 +39,11 @@
mkStaticSystemdNetwork = { mkStaticSystemdNetwork = {
interface, interface,
ip, ips,
router, routers,
nameserver, nameservers,
routable, routable,
}: { }: {
# name = "enp0s31f6"; # Network interface name?
enable = true; enable = true;
# See man systemd.link, man systemd.netdev, man systemd.network # See man systemd.link, man systemd.netdev, man systemd.network
@ -54,26 +53,20 @@
}; };
# Static IP + DNS + Gateway # Static IP + DNS + Gateway
address = ip; address = ips;
gateway = router; gateway = routers;
dns = nameserver; dns = nameservers;
routes = builtins.map (r: {Gateway = r;}) routers;
# routes = [
# {
# routeConfig.Gateway = (lib.head router);
# }
# ];
# See man systemd.network # See man systemd.network
networkConfig = { networkConfig = {
# This corresponds to the [NETWORK] section # This corresponds to the [NETWORK] section
DHCP = "no"; DHCP = "no";
# TODO: What does this all do? # IPv6AcceptRA = "no";
# IPv6AcceptRA = true; # MulticastDNS = "no";
# MulticastDNS = "yes"; # Needed? # LLMNR = "no";
# LLMNR = "no"; # Needed? # LinkLocalAddressing = "ipv6";
# LinkLocalAddressing = "no"; # Needed?
}; };
linkConfig = { linkConfig = {

2
system/default.nix
View File

@ -306,7 +306,7 @@ with mylib.networking; {
kdeconnect.enable = false; # Use this instead of HM for firewall setup kdeconnect.enable = false; # Use this instead of HM for firewall setup
neovim.enable = true; neovim.enable = true;
starship.enable = true; starship.enable = true;
thefuck.enable = true; # pay-respects.enable = true; # The new fuck
xwayland.enable = true; xwayland.enable = true;
nix-ld.enable = true; # Load dynamically linked executables nix-ld.enable = true; # Load dynamically linked executables
hyprland.enable = true; hyprland.enable = true;

18
system/nixinator/default.nix
View File

@ -16,16 +16,16 @@
# This should override the default network 50-ether # This should override the default network 50-ether
"10-ether-2_5G" = mylib.networking.mkStaticSystemdNetwork { "10-ether-2_5G" = mylib.networking.mkStaticSystemdNetwork {
interface = "enp8s0"; interface = "enp8s0";
ip = ["192.168.86.50/24" "fd00::32/120"]; ips = ["192.168.86.50/24" "fd00::32/120"];
router = ["192.168.86.5" "fd00::5"]; routers = ["192.168.86.5" "fd00::5"];
nameserver = ["192.168.86.26" "fd00::1a"]; nameservers = ["192.168.86.26" "fd00::1a"];
routable = true; routable = true;
}; };
"10-ether-1G" = mylib.networking.mkStaticSystemdNetwork { "10-ether-1G" = mylib.networking.mkStaticSystemdNetwork {
interface = "enp5s0"; interface = "enp5s0";
ip = ["192.168.86.50/24" "fd00::32/120"]; ips = ["192.168.86.50/24" "fd00::32/120"];
router = ["192.168.86.5" "fd00::5"]; routers = ["192.168.86.5" "fd00::5"];
nameserver = ["192.168.86.26" "fd00::1a"]; nameservers = ["192.168.86.26" "fd00::1a"];
routable = false; routable = false;
}; };
# "10-ether-1G" = mylib.networking.mkStaticSystemdNetwork {...}; # "10-ether-1G" = mylib.networking.mkStaticSystemdNetwork {...};
@ -98,6 +98,12 @@
videoDrivers = ["nvidia"]; # NVIDIA videoDrivers = ["nvidia"]; # NVIDIA
}; };
programs = {
gamemode = {
enable = true;
};
};
# This has been relocated here from the default config, # This has been relocated here from the default config,
# because it forces en-US keyboard layout. # because it forces en-US keyboard layout.
i18n.inputMethod = { i18n.inputMethod = {

3
system/nixinator/hardware-configuration.nix
View File

@ -87,9 +87,6 @@
# video.hidpi.enable = lib.mkDefault true; # No longer has any effect # video.hidpi.enable = lib.mkDefault true; # No longer has any effect
graphics = { graphics = {
enable = true; enable = true;
# Vulkan
# driSupport = true; # NOTE: Deprecated
enable32Bit = true; enable32Bit = true;
# AMD: https://nixos.wiki/wiki/AMD_GPU # AMD: https://nixos.wiki/wiki/AMD_GPU