Compare commits

..

No commits in common. "main" and "new-config" have entirely different histories.

22 changed files with 89 additions and 315 deletions

View file

@ -13,11 +13,11 @@
"sf-pro": "sf-pro" "sf-pro": "sf-pro"
}, },
"locked": { "locked": {
"lastModified": 1772251183, "lastModified": 1758228441,
"narHash": "sha256-Zfr9trB8LaesfpupugDgXPqC4F25MO18kyMyb9b2PkM=", "narHash": "sha256-3mA9oFuhJ1EHyhPd17g/EuJi4jDYPGhyxkEitdh3Kmc=",
"owner": "Lyndeno", "owner": "Lyndeno",
"repo": "apple-fonts.nix", "repo": "apple-fonts.nix",
"rev": "f8dad87c2cb956695d18c1f36360322d8a0b7d63", "rev": "aba9944f6606a69ebedf7bfb723316139eec3f72",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -33,11 +33,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1773889306, "lastModified": 1758287904,
"narHash": "sha256-PAqwnsBSI9SVC2QugvQ3xeYCB0otOwCacB1ueQj2tgw=", "narHash": "sha256-IGmaEf3Do8o5Cwp1kXBN1wQmZwQN3NLfq5t4nHtVtcU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "5ad85c82cc52264f4beddc934ba57f3789f28347", "rev": "67ff9807dd148e704baadbd4fd783b54282ca627",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -74,11 +74,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1774262056, "lastModified": 1759338667,
"narHash": "sha256-WXu81OceTamUkEX/WufrEqofxztQ30jJbPpY+5e2wfc=", "narHash": "sha256-3sd8ILAHJT1EUOEhbN6DCKyiglj7RJckDwbOR6vfPsw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "eedc208a1db00cfdbc75a8689ac1127444930765", "rev": "a2c021dd19cc56b8befc083f4b4c88cad01e1547",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -90,11 +90,11 @@
"flake-compat": { "flake-compat": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1767039857, "lastModified": 1761588595,
"narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
"owner": "edolstra", "owner": "edolstra",
"repo": "flake-compat", "repo": "flake-compat",
"rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -104,27 +104,6 @@
} }
}, },
"flake-parts": { "flake-parts": {
"inputs": {
"nixpkgs-lib": [
"nordvpn-flake",
"hercules-ci-effects",
"nixpkgs"
]
},
"locked": {
"lastModified": 1754487366,
"narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18",
"type": "github"
},
"original": {
"id": "flake-parts",
"type": "indirect"
}
},
"flake-parts_2": {
"inputs": { "inputs": {
"nixpkgs-lib": [ "nixpkgs-lib": [
"nur", "nur",
@ -145,43 +124,6 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils": {
"inputs": {
"systems": "systems_2"
},
"locked": {
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"hercules-ci-effects": {
"inputs": {
"flake-parts": "flake-parts",
"nixpkgs": "nixpkgs_6"
},
"locked": {
"lastModified": 1758022363,
"narHash": "sha256-ENUhCRWgSX4ni751HieNuQoq06dJvApV/Nm89kh+/A0=",
"owner": "hercules-ci",
"repo": "hercules-ci-effects",
"rev": "1a3667d33e247ad35ca250698d63f49a5453d824",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "hercules-ci-effects",
"type": "github"
}
},
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -189,16 +131,15 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1773963144, "lastModified": 1759337100,
"narHash": "sha256-WzBOBfSay3GYilUfKaUa1Mbf8/jtuAiJIedx7fWuIX4=", "narHash": "sha256-CcT3QvZ74NGfM+lSOILcCEeU+SnqXRvl1XCRHenZ0Us=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "a91b3ea73a765614d90360580b689c48102d1d33", "rev": "004753ae6b04c4b18aa07192c1106800aaacf6c3",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-25.11",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -209,11 +150,11 @@
"nixpkgs": "nixpkgs_4" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {
"lastModified": 1773882647, "lastModified": 1763385941,
"narHash": "sha256-VzcOcE0LLpEnyoxLuMuptZ9ZWCkSBn99bTgEQoz5Viw=", "narHash": "sha256-99CBNgyMvg3Zu/hxqixtShevrF4Kfr/qjtizQ6oseVI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NixOS-WSL", "repo": "NixOS-WSL",
"rev": "fd0eae98d1ecee31024271f8d64676250a386ee7", "rev": "cc6483354b236c2fc95cc1d4ba1f0f40b7345e69",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -225,11 +166,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1771848320, "lastModified": 1757745802,
"narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=", "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2fc6539b481e1d2569f25f8799236694180c0993", "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -241,27 +182,27 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1773964973, "lastModified": 1759143472,
"narHash": "sha256-NV/J+tTER0P5iJhUDL/8HO5MDjDceLQPRUYgdmy5wXw=", "narHash": "sha256-TvODmeR2W7yX/JmOCmP+lAFNkTT7hAxYcF3Kz8SZV3w=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "812b3986fd1568f7a858f97fcf425ad996ba7d25", "rev": "5ed4e25ab58fd4c028b59d5611e14ea64de51d23",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-25.11", "ref": "nixos-25.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1774106199, "lastModified": 1760524057,
"narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=", "narHash": "sha256-EVAqOteLBFmd7pKkb0+FIUyzTF61VKi7YmvP1tw4nEw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6c9a78c09ff4d6c21d0319114873508a6ec01655", "rev": "544961dfcce86422ba200ed9a0b00dd4b1486ec5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -305,11 +246,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1773734432, "lastModified": 1762977756,
"narHash": "sha256-IF5ppUWh6gHGHYDbtVUyhwy/i7D261P7fWD1bPefOsw=", "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "cda48547b432e8d3b18b4180ba07473762ec8558", "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -321,43 +262,27 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1773964973, "lastModified": 1760862643,
"narHash": "sha256-NV/J+tTER0P5iJhUDL/8HO5MDjDceLQPRUYgdmy5wXw=", "narHash": "sha256-PXwG0TM7Ek87DNx4LbGWuD93PbFeKAJs4FfALtp7Wo0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "812b3986fd1568f7a858f97fcf425ad996ba7d25", "rev": "33c6dca0c0cb31d6addcd34e90a63ad61826b28c",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-25.11", "ref": "nixos-25.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1755027561, "lastModified": 1759036355,
"narHash": "sha256-IVft239Bc8p8Dtvf7UAACMG5P3ZV+3/aO28gXpGtMXI=", "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "005433b926e16227259a1843015b5b2b7f7d1fc3",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_7": {
"locked": {
"lastModified": 1774106199,
"narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6c9a78c09ff4d6c21d0319114873508a6ec01655", "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -367,65 +292,17 @@
"type": "github" "type": "github"
} }
}, },
"nordvpn-amd64-deb": {
"flake": false,
"locked": {
"narHash": "sha256-AfVDD/9ASErvgcG590/O+l7jeIeAv+PQkOvkRX8wC7I=",
"type": "file",
"url": "https://repo.nordvpn.com/deb/nordvpn/debian/pool/main/n/nordvpn/nordvpn_4.2.0_amd64.deb"
},
"original": {
"type": "file",
"url": "https://repo.nordvpn.com/deb/nordvpn/debian/pool/main/n/nordvpn/nordvpn_4.2.0_amd64.deb"
}
},
"nordvpn-arm64-deb": {
"flake": false,
"locked": {
"narHash": "sha256-YweSq0QV+rMNWvvWw6RN0XbsvGeZVIUlJo3z+l+f79w=",
"type": "file",
"url": "https://repo.nordvpn.com/deb/nordvpn/debian/pool/main/n/nordvpn/nordvpn_4.2.0_arm64.deb"
},
"original": {
"type": "file",
"url": "https://repo.nordvpn.com/deb/nordvpn/debian/pool/main/n/nordvpn/nordvpn_4.2.0_arm64.deb"
}
},
"nordvpn-flake": {
"inputs": {
"flake-utils": "flake-utils",
"hercules-ci-effects": "hercules-ci-effects",
"nixpkgs": [
"nixpkgs"
],
"nordvpn-amd64-deb": "nordvpn-amd64-deb",
"nordvpn-arm64-deb": "nordvpn-arm64-deb"
},
"locked": {
"lastModified": 1764175314,
"narHash": "sha256-fe3+VYJb5poUyrlyLe9GCgTggkxPo/JvXZ4EGroIY10=",
"owner": "connerohnesorge",
"repo": "nordvpn-flake",
"rev": "97d3e39957c207af6b732f2b290763404041f36e",
"type": "github"
},
"original": {
"owner": "connerohnesorge",
"repo": "nordvpn-flake",
"type": "github"
}
},
"nur": { "nur": {
"inputs": { "inputs": {
"flake-parts": "flake-parts_2", "flake-parts": "flake-parts",
"nixpkgs": "nixpkgs_7" "nixpkgs": "nixpkgs_6"
}, },
"locked": { "locked": {
"lastModified": 1774262207, "lastModified": 1759340767,
"narHash": "sha256-VDjz6p/BMjjqLZJP5YzW5pjlt3s3jJUpVX8fTwU7zAk=", "narHash": "sha256-M3AwMhtQGipW1cSpNnKfpxDE8mNWBp8uBbWngx8h+fc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nur", "repo": "nur",
"rev": "2f17ef721626a9d87acb7f74da31cbb15b452797", "rev": "e9ad6dbc1abce2c321b691b08db554b5e086dd9a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -456,7 +333,6 @@
"nixos-wsl": "nixos-wsl", "nixos-wsl": "nixos-wsl",
"nixpkgs": "nixpkgs_5", "nixpkgs": "nixpkgs_5",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
"nordvpn-flake": "nordvpn-flake",
"nur": "nur" "nur": "nur"
} }
}, },
@ -505,7 +381,7 @@
"sf-compact": { "sf-compact": {
"flake": false, "flake": false,
"locked": { "locked": {
"narHash": "sha256-oLhkN4HYkU1Xjxk+xdmyxJmROSzo1qd/tafdxw7icxs=", "narHash": "sha256-WeqT80cdK/XzTLSaJs5DHodzxoeAzwL/xTgdq0YwQbM=",
"type": "file", "type": "file",
"url": "https://devimages-cdn.apple.com/design/resources/download/SF-Compact.dmg" "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Compact.dmg"
}, },
@ -553,7 +429,7 @@
"sf-pro": { "sf-pro": {
"flake": false, "flake": false,
"locked": { "locked": {
"narHash": "sha256-s42hsaUe0Vkaw5yw8G7G3W3AYJb2TPqSlMqPyY0e5WU=", "narHash": "sha256-vprahHpCUf9O8RualBrEuLEfuLfzI/2d8AQmwlCGPPk=",
"type": "file", "type": "file",
"url": "https://devimages-cdn.apple.com/design/resources/download/SF-Pro.dmg" "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Pro.dmg"
}, },
@ -576,21 +452,6 @@
"repo": "default", "repo": "default",
"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"
}
} }
}, },
"root": "root", "root": "root",

View file

@ -1,10 +1,10 @@
{ {
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
nixos-wsl.url = "github:nix-community/NixOS-WSL/main"; nixos-wsl.url = "github:nix-community/NixOS-WSL/main";
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-25.11"; url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
disko = { disko = {
@ -18,11 +18,9 @@
}; };
apple-fonts.url = "github:Lyndeno/apple-fonts.nix"; apple-fonts.url = "github:Lyndeno/apple-fonts.nix";
duralumin.url = "git+https://git.nirgendwo.xyz/janis/duralumin.git"; duralumin.url = "git+https://git.nirgendwo.xyz/janis/duralumin.git";
nordvpn-flake.url = "github:connerohnesorge/nordvpn-flake";
nordvpn-flake.inputs.nixpkgs.follows = "nixpkgs";
}; };
outputs = inputs @ { disko, nixpkgs, nixos-wsl, nixpkgs-unstable, home-manager, duralumin, emacs-overlay, nordvpn-flake, ... }: outputs = inputs @ { self, disko, nixpkgs, nixos-wsl, nixpkgs-unstable, home-manager, duralumin, emacs-overlay, ... }:
let let
system = "x86_64-linux"; system = "x86_64-linux";
overlay-unstable = final: prev: { overlay-unstable = final: prev: {
@ -42,7 +40,6 @@
./pkgs ./pkgs
host host
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
nordvpn-flake.nixosModules.default
disko.nixosModules.disko disko.nixosModules.disko
{ {
home-manager.useGlobalPkgs = true; # Use global packages in home-manager home-manager.useGlobalPkgs = true; # Use global packages in home-manager

View file

@ -19,7 +19,7 @@ in {
fonts.fontconfig.enable = true; fonts.fontconfig.enable = true;
home = { home = {
stateVersion = "25.11"; stateVersion = "25.05";
homeDirectory = "/home/${user.username}"; homeDirectory = "/home/${user.username}";
username = user.username; username = user.username;
@ -54,8 +54,6 @@ in {
# for running wayland apps over ssh # for running wayland apps over ssh
waypipe waypipe
blender
screenshot screenshot
]; ];
}; };

View file

@ -6,7 +6,6 @@
./development ./development
./emacs.nix ./emacs.nix
./firefox.nix ./firefox.nix
./games
./git-ssh.nix ./git-ssh.nix
./hyprlock_idle.nix ./hyprlock_idle.nix
./libinput.nix ./libinput.nix

View file

@ -5,9 +5,6 @@
feh feh
sxiv sxiv
# Chromium browser
ungoogled-chromium
vanilla-dmz vanilla-dmz
whitesur-cursors whitesur-cursors
@ -19,6 +16,8 @@
bitwarden-desktop bitwarden-desktop
bitwarden-cli bitwarden-cli
# Minecraft Launcher
prismlauncher
virt-manager virt-manager
foliate foliate

View file

@ -1,48 +1,4 @@
{...}: { {pkgs, ...}: {
# home.packages = with pkgs; [ # home.packages = with pkgs; [
# ]; # ];
home.file.".cargo/config.toml".text = ''
[unstable]
codegen-backend = true
[profile.dev]
codegen-backend = "cranelift"
[profile.dev.package."*"]
codegen-backend = "llvm"
# Consider compiling deps with cranelift if you want cold-compilation to be faster
# codegen-backend = "cranelift"
# cranelift is `panic = abort`, so you need to compile with llvm to get `#[should_panic]` working
[profile.test.package."*"]
codegen-backend = "llvm"
# Disable cranelift for release profile
[profile.release]
codegen-backend = "llvm"
# cranelift cannot build wasm32-unknown-unknown out of the box
[profile.web]
codegen-backend = "llvm"
[build]
# Using a global target dir allows all projects to share incremental compilation results,
# vastly speeding up cold-compilation of new projects.
target-dir = "/var/code/rust/.cargo/global-target"
[target.x86_64-unknown-linux-gnu]
linker = "clang"
rustflags = [
"-Clink-arg=--ld-path=mold",
# Compile faster
"-Zshare-generics=y",
"-Zthreads=12",
]
rustdocflags = [
# Compile faster
"-Zshare-generics=y",
"-Zthreads=12",
]
'';
} }

View file

@ -21,7 +21,7 @@ in {
libvterm-neovim # vterm support for Emacs libvterm-neovim # vterm support for Emacs
nodejs_24 nodejs_24
copilot-node-server copilot-node-server
copilot-language-server copilot-language-server-fhs
cmake cmake
libtool libtool
gnumake gnumake

View file

@ -1,6 +0,0 @@
{pkgs, ...}: {
home.packages = with pkgs; [
# Minecraft Launcher
prismlauncher
];
}

View file

@ -1,12 +1,15 @@
{pkgs, ...}: { {pkgs, ...}: {
programs.git = { programs.git = {
enable = true; enable = true;
settings = { userName = "janis";
user = { userEmail = "janis@nirgendwo.xyz";
name = "janis";
email = "janis@nirgendwo.xyz"; signing = {
format = "ssh";
key = "~/.ssh/duralumin_janis-github";
}; };
extraConfig = {
init = { init = {
defaultBranch = "main"; defaultBranch = "main";
}; };
@ -17,11 +20,6 @@
gpgsign = "true"; gpgsign = "true";
}; };
}; };
signing = {
format = "ssh";
key = "~/.ssh/duralumin_janis-github";
};
}; };
programs.ssh = { programs.ssh = {
@ -66,11 +64,10 @@
identityFile = "~/.ssh/duralumin_janis-github"; identityFile = "~/.ssh/duralumin_janis-github";
addKeysToAgent = "yes"; addKeysToAgent = "yes";
}; };
"github-noonebtw" = { "noonebtw.github.com" = {
host = "github-noonebtw"; host = "noonebtw.github.com";
hostname = "github.com"; hostname = "github.com";
user = "git"; identityFile = "~/.ssh/id_ed25519_git";
identityFile = "~/.ssh/duralumin_noonebtw-github";
addKeysToAgent = "yes"; addKeysToAgent = "yes";
}; };
}; };

View file

@ -237,7 +237,7 @@ configuration {
''; '';
programs.rofi = { programs.rofi = {
enable = true; enable = true;
package = pkgs.rofi; package = pkgs.rofi-wayland;
terminal = "{pkgs.alacritty}/bin/alacritty"; terminal = "{pkgs.alacritty}/bin/alacritty";
theme = "spotlight.rasi"; theme = "spotlight.rasi";

View file

@ -15,7 +15,7 @@ in {
wmctrl wmctrl
alsa-utils alsa-utils
wireplumber wireplumber
rofi rofi-wayland
alacritty alacritty

View file

@ -1,4 +0,0 @@
{...}: {
wsl.enable = true;
wsl.defaultUser = "user";
}

View file

@ -13,7 +13,6 @@
cacert, cacert,
libxml2, libxml2,
libidn2, libidn2,
sqlite,
libnl, libnl,
libcap, libcap,
libcap_ng, libcap_ng,
@ -25,20 +24,20 @@
let let
buildEnv = if builtins.typeOf buildFHSEnvChroot == "set" then buildFHSEnvChroot else buildFHSUserEnv; buildEnv = if builtins.typeOf buildFHSEnvChroot == "set" then buildFHSEnvChroot else buildFHSUserEnv;
pname = "nordvpn"; pname = "nordvpn";
version = "4.4.0"; version = "4.0.0";
janis-bhm = { janis-bhm = {
name = "Janis B."; name = "Janis B.";
email = "janis@nirgendwo.xyz"; email = "janis@nirgendwo.xyz";
github = "janis-bhm"; github = "janis-bhm";
}; };
# libxml2_13 = libxml2.overrideAttrs rec { libxml2_13 = libxml2.overrideAttrs rec {
# version = "2.13.8"; version = "2.13.8";
# src = fetchurl { src = fetchurl {
# url = "mirror://gnome/sources/libxml2/${lib.versions.majorMinor version}/libxml2-${version}.tar.xz"; url = "mirror://gnome/sources/libxml2/${lib.versions.majorMinor version}/libxml2-${version}.tar.xz";
# hash = "sha256-J3KUyzMRmrcbK8gfL0Rem8lDW4k60VuyzSsOhZoO6Eo="; hash = "sha256-J3KUyzMRmrcbK8gfL0Rem8lDW4k60VuyzSsOhZoO6Eo=";
# }; };
# }; };
nordvpnd = buildEnv { nordvpnd = buildEnv {
name = "nordvpnd"; name = "nordvpnd";
@ -67,16 +66,15 @@ ln -s ${nordvpn}/lib/nordvpn $out/usr/lib/nordvpn
src = fetchurl { src = fetchurl {
url = "https://repo.nordvpn.com/deb/nordvpn/debian/pool/main/n/nordvpn/nordvpn_${version}_amd64.deb"; url = "https://repo.nordvpn.com/deb/nordvpn/debian/pool/main/n/nordvpn/nordvpn_${version}_amd64.deb";
hash = "sha256-rePBEVe6o49If5dYvIUW361E7nFqngzd+XkiOeehY7w="; hash = "sha256-elKREKiFrx2TgJPJl1ARtEebsv4PNG9fMq2mrV9xngs=";
}; };
buildInputs = [ buildInputs = [
libxml2 libxml2_13
libidn2 libidn2
libnl libnl
libcap libcap
libcap_ng libcap_ng
sqlite
]; ];
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -1,5 +1,5 @@
{...}: { {...}: {
imports = [ imports = [
# ./nordvpn.nix ./nordvpn.nix
]; ];
} }

View file

@ -19,7 +19,7 @@
]; ];
system = { system = {
stateVersion = "25.11"; stateVersion = "25.05";
activationScripts = { activationScripts = {
rfkill-unblock = { rfkill-unblock = {
text = '' text = ''

View file

@ -4,7 +4,7 @@
packages = with pkgs; [ packages = with pkgs; [
noto-fonts noto-fonts
noto-fonts-cjk-sans noto-fonts-cjk-sans
noto-fonts-color-emoji noto-fonts-emoji
liberation_ttf liberation_ttf
roboto roboto
roboto-mono roboto-mono

View file

@ -1,6 +1,8 @@
{...}: { {...}: {
networking = { networking = {
nameservers = [ "9.9.9.9#dns.quad9.net" "1.1.1.1#one.one.one.one" ]; nameservers = [ "9.9.9.9#dns.quad9.net" "1.1.1.1#one.one.one.one" ];
# networkmanager.wifi.backend = "iwd";
# networkmanager.enable = true;
firewall = { firewall = {
enable = true; enable = true;
@ -14,16 +16,11 @@
}; };
}; };
services.nordvpn = { services.resolved = {
enable = true; enable = true;
users = [ "user" ]; dnssec = "true";
domains = ["~."];
fallbackDns = [ "9.9.9.9#dns.quad9.net" "149.112.112.112#dns.quad9.net" "1.1.1.1#one.one.one.one" "1.0.0.1#one.one.one.one" ];
dnsovertls = "true";
}; };
# services.resolved = {
# enable = true;
# dnssec = "true";
# domains = ["~."];
# fallbackDns = [ "9.9.9.9#dns.quad9.net" "149.112.112.112#dns.quad9.net" "1.1.1.1#one.one.one.one" "1.0.0.1#one.one.one.one" ];
# dnsovertls = "true";
# };
} }

View file

@ -12,14 +12,5 @@
swtpm.enable = true; swtpm.enable = true;
}; };
}; };
docker = {
enable = true;
# Use the rootless mode - run Docker daemon as non-root user
rootless = {
enable = true;
setSocketVariable = true;
};
};
}; };
} }

View file

@ -12,7 +12,7 @@ in {
home = "/home/${user.username}"; home = "/home/${user.username}";
createHome = true; createHome = true;
isNormalUser = true; isNormalUser = true;
extraGroups = [ "wheel" "input" "nordvpn" "networkmanager" "libvirtd" "docker" ]; extraGroups = [ "wheel" "input" "nordvpn" "networkmanager" "libvirtd" ];
}; };
programs.zsh.enable = true; programs.zsh.enable = true;

View file

@ -6,7 +6,6 @@ in {
../options.nix ../options.nix
./common.nix ./common.nix
./greetd.nix ./greetd.nix
./steam.nix
]; ];
services.udisks2.enable = true; services.udisks2.enable = true;

View file

@ -3,7 +3,7 @@
enable = true; enable = true;
settings = { settings = {
default_session = { default_session = {
command = "${pkgs.tuigreet}/bin/tuigreet --time --cmd 'dbus-run-session sway'"; command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd 'dbus-run-session sway'";
user = "greeter"; user = "greeter";
}; };
}; };

View file

@ -1,8 +0,0 @@
{...}: {
programs.steam = {
enable = true;
remotePlay.openFirewall = true;
localNetworkGameTransfers.openFirewall = true;
dedicatedServer.openFirewall = true;
};
}