Compare commits

..

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

37 changed files with 233 additions and 746 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": 1781152676, "lastModified": 1758287904,
"narHash": "sha256-RxWs5ND31KzTG7wvMM+PMfUjyNpmIEr999lqNARaM5o=", "narHash": "sha256-IGmaEf3Do8o5Cwp1kXBN1wQmZwQN3NLfq5t4nHtVtcU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "ff8702b4de27f72b4c78573dfb89ec74e36abdf1", "rev": "67ff9807dd148e704baadbd4fd783b54282ca627",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -74,11 +74,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1785062976, "lastModified": 1759338667,
"narHash": "sha256-3PQYC0Gm9NfAJbko6JTtFBlujtXWm7L5VZpUVJRu04c=", "narHash": "sha256-3sd8ILAHJT1EUOEhbN6DCKyiglj7RJckDwbOR6vfPsw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "ecf4a1a2d40f5cf118e7ffa255212ffba6036151", "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": 1772408722,
"narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3",
"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": 1773550609,
"narHash": "sha256-neu7ixXHjV3LobVjOndkL97u+6UF6Yoh+CUnzX7kUBQ=",
"owner": "hercules-ci",
"repo": "hercules-ci-effects",
"rev": "554f6ed448ca74c00aa2371cde901ae1e73005b9",
"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": 1784350909, "lastModified": 1759337100,
"narHash": "sha256-ZWyzLbS1yKUTeFJLmdVuWNnHttL333/ldJbEE+KzCrM=", "narHash": "sha256-CcT3QvZ74NGfM+lSOILcCEeU+SnqXRvl1XCRHenZ0Us=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "4ce190229c73d44536caa7072f6308fb2d8feeb3", "rev": "004753ae6b04c4b18aa07192c1106800aaacf6c3",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-26.05",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -209,11 +150,11 @@
"nixpkgs": "nixpkgs_4" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {
"lastModified": 1784642409, "lastModified": 1763385941,
"narHash": "sha256-hcbDqFuySAJawljt5r0sKBCJKYnbtGD0T/ZIozH1Dq0=", "narHash": "sha256-99CBNgyMvg3Zu/hxqixtShevrF4Kfr/qjtizQ6oseVI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NixOS-WSL", "repo": "NixOS-WSL",
"rev": "eaeb18da90024448a60eb1ec7132eafa4003404e", "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": 1784856561, "lastModified": 1759143472,
"narHash": "sha256-J+Bx1Z6Oeoj2FgnBhRMKyUhhtDoOpTgXYaVLZpDjW4A=", "narHash": "sha256-TvODmeR2W7yX/JmOCmP+lAFNkTT7hAxYcF3Kz8SZV3w=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "597283ad8aa0b331c788e97c4c262d58877074ef", "rev": "5ed4e25ab58fd4c028b59d5611e14ea64de51d23",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-26.05", "ref": "nixos-25.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1784796856, "lastModified": 1760524057,
"narHash": "sha256-wWFrV5/Qbm+lyt5x20E/bSbfJiGKMo4RCxZV8cl/WZI=", "narHash": "sha256-EVAqOteLBFmd7pKkb0+FIUyzTF61VKi7YmvP1tw4nEw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e2587caef70cea85dd97d7daab492899902dbf5d", "rev": "544961dfcce86422ba200ed9a0b00dd4b1486ec5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -305,11 +246,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1783776592, "lastModified": 1762977756,
"narHash": "sha256-UgCQzxeWI75XM8G+hPrPh+MKzEPjG3SpAj7dtqSbksA=", "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e7a3ca8092b61ff85b6a45bf863ea2b2d6a661b3", "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -321,43 +262,27 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1784856561, "lastModified": 1760862643,
"narHash": "sha256-J+Bx1Z6Oeoj2FgnBhRMKyUhhtDoOpTgXYaVLZpDjW4A=", "narHash": "sha256-PXwG0TM7Ek87DNx4LbGWuD93PbFeKAJs4FfALtp7Wo0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "597283ad8aa0b331c788e97c4c262d58877074ef", "rev": "33c6dca0c0cb31d6addcd34e90a63ad61826b28c",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-26.05", "ref": "nixos-25.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1773389992, "lastModified": 1759036355,
"narHash": "sha256-wvfdLLWJ2I9oEpDd9PfMA8osfIZicoQ5MT1jIwNs9Tk=", "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c06b4ae3d6599a672a6210b7021d699c351eebda",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_7": {
"locked": {
"lastModified": 1784796856,
"narHash": "sha256-wWFrV5/Qbm+lyt5x20E/bSbfJiGKMo4RCxZV8cl/WZI=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e2587caef70cea85dd97d7daab492899902dbf5d", "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -367,65 +292,17 @@
"type": "github" "type": "github"
} }
}, },
"nordvpn-amd64-deb": {
"flake": false,
"locked": {
"narHash": "sha256-thKXQLibQFJZnmhzOQ9t6cHXhtvAnDp/+17iL2QN8DU=",
"type": "file",
"url": "https://repo.nordvpn.com/deb/nordvpn/debian/pool/main/n/nordvpn/nordvpn_5.2.0_amd64.deb"
},
"original": {
"type": "file",
"url": "https://repo.nordvpn.com/deb/nordvpn/debian/pool/main/n/nordvpn/nordvpn_5.2.0_amd64.deb"
}
},
"nordvpn-arm64-deb": {
"flake": false,
"locked": {
"narHash": "sha256-+uaBeHdHufzFLZYusySy9oMK3f3+y/wBntAIkic0O+I=",
"type": "file",
"url": "https://repo.nordvpn.com/deb/nordvpn/debian/pool/main/n/nordvpn/nordvpn_5.2.0_arm64.deb"
},
"original": {
"type": "file",
"url": "https://repo.nordvpn.com/deb/nordvpn/debian/pool/main/n/nordvpn/nordvpn_5.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": 1785076980,
"narHash": "sha256-YPTjlQaKCC2Leqej/d1ONI4JC26+zQv3R9zX+p60uDk=",
"owner": "janis-bhm",
"repo": "nordvpn-flake",
"rev": "62cdfd932a7259045cc5064796f6a4561164f2b6",
"type": "github"
},
"original": {
"owner": "janis-bhm",
"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": 1785072147, "lastModified": 1759340767,
"narHash": "sha256-DSH73PfXqVWYz30Hnx1oeKQUx0w+C2cS3KpVN8BRYrw=", "narHash": "sha256-M3AwMhtQGipW1cSpNnKfpxDE8mNWBp8uBbWngx8h+fc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nur", "repo": "nur",
"rev": "a89983ca76709019703fec796f038a42172012ab", "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-26.05"; 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-26.05"; 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:janis-bhm/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
@ -61,14 +58,10 @@
pkgs = import nixpkgs { pkgs = import nixpkgs {
inherit system; inherit system;
config.allowUnfree = true; # Allow unfree packages globally config.allowUnfree = true; # Allow unfree packages globally
config.permittedInsecurePackages = [
"electron-39.8.10"
];
overlays = [ overlays = [
inputs.nur.overlays.default inputs.nur.overlays.default
emacs-overlay.overlays.default emacs-overlay.overlays.default
nordvpn-flake.overlays.default
overlay-unstable overlay-unstable
duralumin.overlays.default duralumin.overlays.default
]; ];

View file

@ -19,7 +19,7 @@ in {
fonts.fontconfig.enable = true; fonts.fontconfig.enable = true;
home = { home = {
stateVersion = "26.05"; stateVersion = "25.05";
homeDirectory = "/home/${user.username}"; homeDirectory = "/home/${user.username}";
username = user.username; username = user.username;
@ -34,26 +34,26 @@ in {
}; };
packages = with pkgs; [ packages = with pkgs; [
# see also: system/core.nix # Add your global packages here
# keygen
duralumin duralumin
duralumin-keygen duralumin-keygen
# terminal utilities
gh
yazi
ranger ranger
neovim neovim
bottom
nix-index git
wget
imagemagick curl
tree
htop
ripgrep
killall
xdg-utils
file
gh
# for running wayland apps over ssh # for running wayland apps over ssh
waypipe waypipe
# my own screenshot utility
screenshot screenshot
]; ];
}; };

View file

@ -1,15 +1,11 @@
{...}: { {...}: {
imports = [ imports = [
./alacritty.nix ./alacritty.nix
./ghostty.nix
./common.nix ./common.nix
./desktop-apps.nix ./desktop-apps.nix
./development ./development
./emacs.nix ./emacs.nix
./mail.nix
./firefox.nix ./firefox.nix
./games
./ollama.nix
./git-ssh.nix ./git-ssh.nix
./hyprlock_idle.nix ./hyprlock_idle.nix
./libinput.nix ./libinput.nix
@ -22,6 +18,5 @@
./wallpapers.nix ./wallpapers.nix
./waybar.nix ./waybar.nix
./zsh.nix ./zsh.nix
./wireless.nix
]; ];
} }

View file

@ -5,15 +5,6 @@
feh feh
sxiv sxiv
# PDF Viewer
sioyek
# Learning
anki-bin
# Chromium browser
ungoogled-chromium
vanilla-dmz vanilla-dmz
whitesur-cursors whitesur-cursors
@ -25,11 +16,11 @@
bitwarden-desktop bitwarden-desktop
bitwarden-cli bitwarden-cli
# Minecraft Launcher
prismlauncher
virt-manager virt-manager
foliate foliate
blender
# GUI File Manager # GUI File Manager
nemo-with-extensions nemo-with-extensions
]; ];

View file

@ -1,10 +1,6 @@
{pkgs, ...}: { {...}: {
imports = [ imports = [
./nix.nix ./nix.nix
./rust.nix ./rust.nix
]; ];
home.packages = with pkgs; [
ghidra-bin
];
} }

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
@ -50,9 +50,6 @@ in {
hunspellDicts.de-de hunspellDicts.de-de
hunspellDicts.da-dk hunspellDicts.da-dk
# English word lists for spell checking
scowl
# jinx from emacsPackages # jinx from emacsPackages
emacsPackages.jinx emacsPackages.jinx

View file

@ -18,7 +18,6 @@ in{
profiles = { profiles = {
default = { default = {
isDefault = true; isDefault = true;
name = "User";
search = { search = {
default = "ddg"; default = "ddg";
@ -46,57 +45,8 @@ in{
"new-tab-button" "new-tab-button"
]; ];
"browser.download.autohideButton" = false;
"browser.uiCustomization.state" = '' "browser.uiCustomization.state" = ''
{ {"placements":{"widget-overflow-fixed-list":[],"unified-extensions-area":["_04188724-64d3-497b-a4fd-7caffe6eab29_-browser-action"],"nav-bar":["sidebar-button","firefox-view-button","alltabs-button","back-button","forward-button","stop-reload-button","urlbar-container","vertical-spacer","_446900e4-71c2-419f-a6a7-df9c091e268b_-browser-action","unified-extensions-button"],"toolbar-menubar":["menubar-items"],"TabsToolbar":[],"vertical-tabs":["tabbrowser-tabs"],"PersonalToolbar":["import-button","personal-bookmarks"]},"seen":["developer-button","screenshot-button","_446900e4-71c2-419f-a6a7-df9c091e268b_-browser-action","ublock0_raymondhill_net-browser-action","_04188724-64d3-497b-a4fd-7caffe6eab29_-browser-action"],"dirtyAreaCache":["nav-bar","TabsToolbar","vertical-tabs","PersonalToolbar","unified-extensions-area","toolbar-menubar"],"currentVersion":23,"newElementCount":0}'';
"placements": {
"widget-overflow-fixed-list": [],
"unified-extensions-area": [
"_04188724-64d3-497b-a4fd-7caffe6eab29_-browser-action"
],
"nav-bar": [
"sidebar-button",
"firefox-view-button",
"alltabs-button",
"back-button",
"forward-button",
"stop-reload-button",
"urlbar-container",
"vertical-spacer",
"_446900e4-71c2-419f-a6a7-df9c091e268b_-browser-action",
"unified-extensions-button",
"downloads-button"
],
"toolbar-menubar": [
"menubar-items"
],
"TabsToolbar": [],
"vertical-tabs": [
"tabbrowser-tabs"
],
"PersonalToolbar": [
"import-button",
"personal-bookmarks"
]
},
"seen": [
"developer-button",
"screenshot-button",
"_446900e4-71c2-419f-a6a7-df9c091e268b_-browser-action",
"ublock0_raymondhill_net-browser-action",
"_04188724-64d3-497b-a4fd-7caffe6eab29_-browser-action"
],
"dirtyAreaCache": [
"nav-bar",
"TabsToolbar",
"vertical-tabs",
"PersonalToolbar",
"unified-extensions-area",
"toolbar-menubar"
],
"currentVersion": 23,
"newElementCount": 0
}'';
# hardening # hardening
"browser.newtabpage.enabled" = true; "browser.newtabpage.enabled" = true;

View file

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

View file

@ -1,29 +0,0 @@
{lib, super-config, ...}:
let
# theme = import ../data/theme.nix {config = super-config; };
mkIfOrElse = cond: then_: else_: (lib.mkMerge [
(lib.mkIf cond then_)
(lib.mkIf (!cond) else_)
]);
in {
programs.ghostty = {
enable = true;
settings = {
font-family = "monospace";
font-size = 11;
title-report = true;
shell-integration = "zsh";
shell-integration-features = "no-cursor";
theme = "dark: Gruvbox Dark, light: Gruvbox Light";
window-theme = mkIfOrElse (super-config.darkMode == true) "dark" "light";
cursor-style = "block";
cursor-style-blink = false;
cursor-opacity = 0.8;
keybind = [
"ctrl+shift+enter=new_window"
];
};
};
}

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

@ -1,65 +0,0 @@
{pkgs, ...}: {
programs.thunderbird = {
enable = true;
profiles.default = {
isDefault = true;
};
};
home.packages = with pkgs; [
rofi-rbw-wayland
pinentry-rofi
wl-clipboard
];
programs.rbw = {
enable = true;
settings = {
base_url = "https://vaultwarden.nirgendwo.xyz";
email = "janis@nirgendwo.xyz";
pinentry = pkgs.pinentry-rofi;
lock_timeout = 3600;
};
};
accounts.email.accounts = {
"Janis @ GMail" = {
address = "j4nisboehm@gmail.com";
realName = "Janis Böhm";
flavor = "gmail.com";
thunderbird = {
enable = true;
profiles = [ "default" ];
};
passwordCommand = [ "rbw" "get" "j4nisboehm @ Google" ];
};
"Janis @ Nirgendwo" = {
primary = true;
address = "janis@nirgendwo.xyz";
realName = "Janis Böhm";
userName = "janis";
imap = {
host = "mail.nirgendwo.xyz";
port = 993;
tls.enable = true;
};
smtp = {
host = "mail.nirgendwo.xyz";
port = 465;
tls.enable = true;
};
thunderbird = {
enable = true;
profiles = [ "default" ];
};
passwordCommand = [ "rbw" "get" "janis @ nirgendswo.com" ];
};
};
}

View file

@ -1,6 +0,0 @@
{pkgs, ...}: {
services.ollama = {
enable = false;
package = pkgs.ollama-vulkan;
};
}

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
@ -50,145 +50,136 @@ in {
"*".scale = "${lib.strings.floatToString super-config.desktop_scale}"; "*".scale = "${lib.strings.floatToString super-config.desktop_scale}";
}// super-config.extraOutputConfig; }// super-config.extraOutputConfig;
startup = [ startup = [
{ {
command = "dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"; always = true;
} command = "${pkgs.gammastep}/bin/gammastep -l 54:10 -t 6500k:4500k";
{ }
command = "gesttings set org.gnome.desktop.interface color-scheme 'prefer-dark'"; # {
} # always = true;
{ # command = "systemctl --user restart libinput-gestures.service";
command = "gsettings set org.gnome.desktop.interface gtk-theme 'Adwaita-dark'"; # }
} # {
{ # always = true;
always = true; # command = "systemctl --user start wpaperd.service";
command = "${pkgs.gammastep}/bin/gammastep -l 54:10 -t 6500k:4500k"; # }
} ];
# {
# always = true;
# command = "systemctl --user restart libinput-gestures.service";
# }
# {
# always = true;
# command = "systemctl --user start wpaperd.service";
# }
];
gaps = { gaps = {
inner = 8; inner = 8;
}; };
bars = [{ bars = [{
command = "${pkgs.waybar}/bin/waybar"; command = "${pkgs.waybar}/bin/waybar";
}]; }];
window = { window = {
border = 3; border = 3;
titlebar = false; titlebar = false;
}; };
input = { input = {
"type:pointer" = { "type:pointer" = {
pointer_accel = "-1"; pointer_accel = "-1";
}; };
"type:keyboard" = { "type:keyboard" = {
xkb_layout = "gb,dk"; xkb_layout = "gb,dk";
xkb_options = xkb_options =
"caps:escape,grp:menu_toggle,grp:rctrl_toggle"; "caps:escape,grp:menu_toggle,grp:rctrl_toggle";
repeat_delay = "250"; repeat_delay = "250";
repeat_rate = "25"; repeat_rate = "25";
}; };
"type:touchpad" = { "type:touchpad" = {
natural_scroll = "enabled"; natural_scroll = "enabled";
tap = "enabled"; tap = "enabled";
tap_button_map = "lrm"; tap_button_map = "lrm";
pointer_accel = "0"; pointer_accel = "0";
}; };
}; };
keybindings = with pkgs; { keybindings = with pkgs; {
"Print" = "exec screenshot"; "Print" = "exec screenshot";
"${mod}+Print" = "exec screenshot --area"; "${mod}+Print" = "exec screenshot --area";
"${mod}+Shift+Print" = "exec screenshot --current-window"; "${mod}+Shift+Print" = "exec screenshot --current-window";
"XF86AudioRaiseVolume" = "exec ${alsa-utils}/bin/amixer set Master 5%+"; "XF86AudioRaiseVolume" = "exec ${alsa-utils}/bin/amixer set Master 5%+";
"XF86AudioLowerVolume" = "exec ${alsa-utils}/bin/amixer set Master 5%-"; "XF86AudioLowerVolume" = "exec ${alsa-utils}/bin/amixer set Master 5%-";
"XF86AudioMute" = "exec ${wireplumber}/bin/wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"; "XF86AudioMute" = "exec ${wireplumber}/bin/wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle";
"XF86AudioMicMute" = "exec ${wireplumber}/bin/wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle"; "XF86AudioMicMute" = "exec ${wireplumber}/bin/wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle";
"XF86AudioPlay" = "mpc toggle"; "XF86AudioPlay" = "mpc toggle";
"XF86AudioNext" = "mpc next"; "XF86AudioNext" = "mpc next";
"XF86AudioPrev" = "mpc prev"; "XF86AudioPrev" = "mpc prev";
"XF86MonBrightnessUp" = "exec ${brightnessctl}/bin/brightnessctl set +5%"; "XF86MonBrightnessUp" = "exec ${brightnessctl}/bin/brightnessctl set +5%";
"XF86MonBrightnessDown" = "exec ${brightnessctl}/bin/brightnessctl set 5%-"; "XF86MonBrightnessDown" = "exec ${brightnessctl}/bin/brightnessctl set 5%-";
"${mod}+Shift+Return" = "exec ${alacritty}/bin/alacritty"; "${mod}+Shift+Return" = "exec ${alacritty}/bin/alacritty";
"${mod}+q" = "kill"; "${mod}+q" = "kill";
"${mod}+p" = "exec ${launcher}"; "${mod}+p" = "exec ${launcher}";
"${mod}+Shift+e" = "exec ${pkgs.emacs}/bin/emacsclient -c -a ''"; "${mod}+Shift+e" = "exec ${pkgs.emacs}/bin/emacsclient -c -a ''";
"${mod}+Shift+b" = "exec ${pkgs.firefox}/bin/firefox"; "${mod}+Shift+b" = "exec ${pkgs.firefox}/bin/firefox";
"${mod}+Shift+c" = "reload"; "${mod}+Shift+c" = "reload";
"${mod}+Shift+q" = "exec ${pkgs.sway}/bin/swaymsg exit"; "${mod}+Shift+q" = "exec ${pkgs.sway}/bin/swaymsg exit";
"${mod}+${left}" = "focus left"; "${mod}+${left}" = "focus left";
"${mod}+${right}" = "focus right"; "${mod}+${right}" = "focus right";
"${mod}+${up}" = "focus up"; "${mod}+${up}" = "focus up";
"${mod}+${down}" = "focus down"; "${mod}+${down}" = "focus down";
"${mod}+Shift+${left}" = "move left"; "${mod}+Shift+${left}" = "move left";
"${mod}+Shift+${right}" = "move right"; "${mod}+Shift+${right}" = "move right";
"${mod}+Shift+${up}" = "move up"; "${mod}+Shift+${up}" = "move up";
"${mod}+Shift+${down}" = "move down"; "${mod}+Shift+${down}" = "move down";
"${mod}+Ctrl+${left}" = "move workspace to output left"; "${mod}+Ctrl+${left}" = "move workspace to output left";
"${mod}+Ctrl+${right}" = "move workspace to output right"; "${mod}+Ctrl+${right}" = "move workspace to output right";
"${mod}+tab" = "workspace back_and_forth"; "${mod}+tab" = "workspace back_and_forth";
"${mod}+b" = "splith"; "${mod}+b" = "splith";
"${mod}+v" = "splitv"; "${mod}+v" = "splitv";
"${mod}+s" = "layout stacking"; "${mod}+s" = "layout stacking";
"${mod}+w" = "layout tabbed"; "${mod}+w" = "layout tabbed";
"${mod}+e" = "layout toggle split"; "${mod}+e" = "layout toggle split";
"${mod}+Shift+space" = "floating toggle"; "${mod}+Shift+space" = "floating toggle";
"${mod}+space" = "focus mode_toggle"; "${mod}+space" = "focus mode_toggle";
"${mod}+Shift+f" = "fullscreen"; "${mod}+Shift+f" = "fullscreen";
} // lib.attrsets.mergeAttrsList (map } // lib.attrsets.mergeAttrsList (map
(n: let workspace = toString n; in { (n: let workspace = toString n; in {
"${mod}+${workspace}" = "workspace ${workspace}"; "${mod}+${workspace}" = "workspace ${workspace}";
"${mod}+Shift+${workspace}" = "move container to workspace ${workspace}"; "${mod}+Shift+${workspace}" = "move container to workspace ${workspace}";
}) })
[1 2 3 4 5 6 7 8 9 0] [1 2 3 4 5 6 7 8 9 0]
); );
colors = { colors = {
focused = { focused = {
background = "#A7C080"; background = "#A7C080";
text = "#272E33"; text = "#272E33";
indicator = "#A7C080"; indicator = "#A7C080";
border = "#A7C080"; border = "#A7C080";
childBorder = "#A7C080"; childBorder = "#A7C080";
}; };
unfocused = { unfocused = {
background = "#9DA9A0"; background = "#9DA9A0";
text = "#272E33"; text = "#272E33";
indicator = "#9DA9A0"; indicator = "#9DA9A0";
border = "#9DA9A0"; border = "#9DA9A0";
childBorder = "#9DA9A0"; childBorder = "#9DA9A0";
}; };
urgent = { urgent = {
background = "#E67E80"; background = "#E67E80";
text = "#272E33"; text = "#272E33";
indicator = "#E67E80"; indicator = "#E67E80";
border = "#E67E80"; border = "#E67E80";
childBorder = "#E67E80"; childBorder = "#E67E80";
}; };
}; };
}; };
}; };
}; };

View file

@ -24,20 +24,14 @@
# GTK Setup # GTK Setup
gtk = { gtk = {
enable = true; enable = true;
# theme = {
# name = "catppuccin-mocha-standard-blue-dark";
# package = pkgs.catppuccin-gtk.override {
# accents = [ "blue" ];
# size = "standard";
# variant = "mocha";
# };
# };
theme = { theme = {
name = "Adwaita-dark"; name = "catppuccin-mocha-standard-blue-dark";
package = pkgs.gnome-themes-extra; package = pkgs.catppuccin-gtk.override {
accents = [ "blue" ];
size = "standard";
variant = "mocha";
};
}; };
iconTheme = { iconTheme = {
name = "Papirus-Dark"; name = "Papirus-Dark";
package = pkgs.catppuccin-papirus-folders.override { package = pkgs.catppuccin-papirus-folders.override {
@ -45,19 +39,14 @@
accent = "blue"; accent = "blue";
}; };
}; };
# cursorTheme = { cursorTheme = {
# name = "catppuccin-mocha-lavender-cursors"; name = "catppuccin-mocha-lavender-cursors";
# package = pkgs.catppuccin-cursors.mochaLavender; package = pkgs.catppuccin-cursors.mochaLavender;
# };
gtk3.extraConfig = {
gtk-application-prefer-dark-theme = lib.mkIf (super-config.darkMode == true) 1;
}; };
gtk4.extraConfig = { gtk3 = {
gtk-application-prefer-dark-theme = lib.mkIf (super-config.darkMode == true) 1; extraConfig.gtk-application-prefer-dark-theme = super-config.darkMode == true;
}; };
}; };
dconf.settings = { dconf.settings = {
"org/gtk/settings/file-chooser" = { "org/gtk/settings/file-chooser" = {
sort-directories-first = true; sort-directories-first = true;
@ -65,7 +54,7 @@
# GTK4 Setup # GTK4 Setup
"org/gnome/desktop/interface" = { "org/gnome/desktop/interface" = {
# gtk-theme = "catppuccin-mocha-standard-blue-dark"; gtk-theme = "catppuccin-mocha-standard-blue-dark";
color-scheme = lib.mkIf (super-config.darkMode == true) "prefer-dark"; color-scheme = lib.mkIf (super-config.darkMode == true) "prefer-dark";
}; };
}; };
@ -99,11 +88,13 @@
qt = { qt = {
enable = true; enable = true;
platformTheme.name = "gtk"; platformTheme.name = "qtct";
style.name = "adwaita-dark"; style = {
name = "kvantum";
};
}; };
systemd.user.sessionVariables = { systemd.user.sessionVariables = {
QT_STYLE_OVERRIDE = "adwaita-dark"; QT_STYLE_OVERRIDE = "kvantum";
}; };
} }

View file

@ -52,7 +52,7 @@ SSID: {essid} {frequency}'';
interval = 30; interval = 30;
exec = "${pkgs.nordvpn-rofi}/bin/nordvpn-rofi --status-json"; exec = "${pkgs.nordvpn-rofi}/bin/nordvpn-rofi --status-json";
return-type = "json"; return-type = "json";
on-click = "rofi -show vpn -modes 'vpn:${pkgs.nordvpn-rofi}/bin/nordvpn-rofi'"; on-click = "rofi -show vpn -modes 'vpn:nordvpn-rofi'";
}; };
style = { style = {
connected.color = theme.normal.black; connected.color = theme.normal.black;

View file

@ -1,7 +0,0 @@
{pkgs, ...}: {
# services.blueman-applet.enable = true;
home.packages = with pkgs; [
# Bluetooth
bluetui
];
}

View file

@ -3,12 +3,6 @@ let
aliases = import ../data/zsh-aliases.nix {}; aliases = import ../data/zsh-aliases.nix {};
in { in {
home.packages = with pkgs; [ pure-prompt ]; home.packages = with pkgs; [ pure-prompt ];
programs.zoxide = {
enable = true;
enableZshIntegration = true;
};
programs.zsh = { programs.zsh = {
enable = true; enable = true;
enableCompletion = true; enableCompletion = true;

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 @@
final: prev: { final: prev: {
# nordvpn = prev.callPackage ./nordvpn.nix {}; nordvpn = prev.callPackage ./nordvpn.nix {};
nordvpn-rofi = prev.callPackage ./nordvpn-rofi.nix {}; nordvpn-rofi = prev.callPackage ./nordvpn-rofi.nix {};
screenshot = prev.callPackage ./screenshot.nix {}; screenshot = prev.callPackage ./screenshot.nix {};
dotfiles = prev.callPackage ./dotfiles.nix {}; dotfiles = prev.callPackage ./dotfiles.nix {};

View file

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

View file

@ -14,6 +14,5 @@
# kernelModules = []; # kernelModules = [];
kernelPackages = pkgs.linuxPackages_zen; kernelPackages = pkgs.linuxPackages_zen;
kernelParams = ["rfkill.default_state=1"];
}; };
} }

View file

@ -4,51 +4,10 @@
zsh zsh
wget wget
curl curl
rsync
git git
vim vim
jq
bat
ripgrep
ripgrep-all
zoxide
file
fd
tree
xdg-utils
# nixos util
nh
# compression
unzip
zip
zstd
# stats and monitoring
inotify-tools
fastfetch
pciutils
usbutils
lsof
lm_sensors
# network tools
nmap
tcpdump
doggo
inetutils
iproute2
whois
# documentation
man-pages
man-db
# system monitoring
htop htop
bottom
killall
linux-firmware linux-firmware
linuxHeaders linuxHeaders
@ -60,7 +19,7 @@
]; ];
system = { system = {
stateVersion = "26.05"; stateVersion = "25.05";
activationScripts = { activationScripts = {
rfkill-unblock = { rfkill-unblock = {
text = '' text = ''

View file

@ -2,7 +2,6 @@
imports = [ imports = [
./boot.nix ./boot.nix
./core.nix ./core.nix
./xdg.nix
./fonts.nix ./fonts.nix
./hardware.nix ./hardware.nix
./networking.nix ./networking.nix

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

@ -9,12 +9,6 @@
tlp = lib.mkIf (config.has_battery) { tlp = lib.mkIf (config.has_battery) {
enable = true; enable = true;
settings = { settings = {
WIFI_PWR_ON_BAT = "on";
DEVICES_TO_ENABLE_ON_STARTUP = "wifi bluetooth";
DEVICES_TO_DISABLE_ON_STARTUP = "";
DEVICES_TO_DISABLE_ON_AC = "";
DEVICES_TO_DISABLE_ON_BAT = "";
START_CHARGE_THRESH_BAT0 = 50; START_CHARGE_THRESH_BAT0 = 50;
STOP_CHARGE_THRESH_BAT0 = 85; STOP_CHARGE_THRESH_BAT0 = 85;
}; };

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,26 +12,4 @@
wifi.backend = "iwd"; # Use iwd for Wi-Fi management. wifi.backend = "iwd"; # Use iwd for Wi-Fi management.
extraFlags = [ "--nodnsproxy" ]; extraFlags = [ "--nodnsproxy" ];
}; };
hardware.bluetooth = {
enable = true;
powerOnBoot = true;
settings = {
General = {
# Shows battery charge of connected devices on supported
# Bluetooth adapters. Defaults to 'false'.
Experimental = true;
# When enabled other devices can connect faster to us, however
# the tradeoff is increased power consumption. Defaults to
# 'false'.
FastConnectable = true;
};
Policy = {
# Enable all controllers when they are found. This includes
# adapters present on start as well as adapters that are plugged
# in later on. Defaults to 'true'.
AutoEnable = true;
};
};
};
} }

View file

@ -1,14 +0,0 @@
{pkgs, ...}: {
xdg.portal = {
enable = true;
wlr.enable = true;
extraPortals = with pkgs; [
xdg-desktop-portal
xdg-desktop-portal-wlr
xdg-desktop-portal-gtk
xdg-desktop-portal-xapp
];
config.common.default = "*";
};
}

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;
};
}