BeiNacht/nixos-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

desktop-2024-09-29-12-25-24

Browse Source
This commit is contained in:
Alexander Szczepanski
2024-09-29 12:25:24 +02:00
parent a77483b5e5
commit 5cc84aea2f
8 changed files with 112 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
README.md
View File

@ -1,11 +1,5 @@
# Most stuff # Most stuff
## Channels
sudo nix-channel --add https://github.com/nix-community/home-manager/archive/release-24.05.tar.gz home-manager
sudo nix-channel --update
sudo nix-channel --add https://nixos.org/channels/nixos-unstable-small nixos-unstable
## Borg Backup ## Borg Backup
it's important to add the ssh host key to known hosts it's important to add the ssh host key to known hosts
@ -13,4 +7,13 @@ it's important to add the ssh host key to known hosts
[u278697.your-storagebox.de]:23 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIICf9svRenC/PLKIL9nk6K/pxQgoiFC41wTNvoIncOxs [u278697.your-storagebox.de]:23 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIICf9svRenC/PLKIL9nk6K/pxQgoiFC41wTNvoIncOxs
[u278697.your-storagebox.de]:23 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA5EB5p/5Hp3hGW1oHok+PIOH9Pbn7cnUiGmUEBrCVjnAw+HrKyN8bYVV0dIGllswYXwkG/+bgiBlE6IVIBAq+JwVWu1Sss3KarHY3OvFJUXZoZyRRg/Gc/+LRCE7lyKpwWQ70dbelGRyyJFH36eNv6ySXoUYtGkwlU5IVaHPApOxe4LHPZa/qhSRbPo2hwoh0orCtgejRebNtW5nlx00DNFgsvn8Svz2cIYLxsPVzKgUxs8Zxsxgn+Q/UvR7uq4AbAhyBMLxv7DjJ1pc7PJocuTno2Rw9uMZi1gkjbnmiOh6TTXIEWbnroyIhwc8555uto9melEUmWNQ+C+PwAK+MPw== [u278697.your-storagebox.de]:23 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA5EB5p/5Hp3hGW1oHok+PIOH9Pbn7cnUiGmUEBrCVjnAw+HrKyN8bYVV0dIGllswYXwkG/+bgiBlE6IVIBAq+JwVWu1Sss3KarHY3OvFJUXZoZyRRg/Gc/+LRCE7lyKpwWQ70dbelGRyyJFH36eNv6ySXoUYtGkwlU5IVaHPApOxe4LHPZa/qhSRbPo2hwoh0orCtgejRebNtW5nlx00DNFgsvn8Svz2cIYLxsPVzKgUxs8Zxsxgn+Q/UvR7uq4AbAhyBMLxv7DjJ1pc7PJocuTno2Rw9uMZi1gkjbnmiOh6TTXIEWbnroyIhwc8555uto9melEUmWNQ+C+PwAK+MPw==
[u278697.your-storagebox.de]:23 ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBAGK0po6usux4Qv2d8zKZN1dDvbWjxKkGsx7XwFdSUCnF19Q8psHEUWR7C/LtSQ5crU/g+tQVRBtSgoUcE8T+FWp5wBxKvWG2X9gD+s9/4zRmDeSJR77W6gSA/+hpOZoSE+4KgNdnbYSNtbZH/dN74EG7GLb/gcIpbUUzPNXpfKl7mQitw== [u278697.your-storagebox.de]:23 ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBAGK0po6usux4Qv2d8zKZN1dDvbWjxKkGsx7XwFdSUCnF19Q8psHEUWR7C/LtSQ5crU/g+tQVRBtSgoUcE8T+FWp5wBxKvWG2X9gD+s9/4zRmDeSJR77W6gSA/+hpOZoSE+4KgNdnbYSNtbZH/dN74EG7GLb/gcIpbUUzPNXpfKl7mQitw==
``` ```
### Commands
```
sudo nix-collect-garbage -d
sudo nix-env -p /nix/var/nix/profiles/system --list-generations
```

10
configs/borg-exclude.nix
View File

@ -1,17 +1,15 @@
{ {
borg-exclude = [ borg-exclude = [
".cache" ".cache"
".config/chromium/Default/Service Worker/CacheStorage"
".config/discord/Cache"
".local/share/libvirt/images" ".local/share/libvirt/images"
".local/share/Steam/config/htmlcache/Cache" ".local/share/Steam"
".local/share/Steam/steamapps"
".local/share/Trash" ".local/share/Trash"
"Games/guild-wars-second/drive_c/Program Files/Guild Wars/Gw.dat"
"Games/guild-wars/drive_c/Program Files/Guild Wars/Gw.dat" "Games/guild-wars/drive_c/Program Files/Guild Wars/Gw.dat"
"Games/guild-wars-second/drive_c/Program Files/Guild Wars/Gw.dat"
"Nextcloud"
"VirtualBox VMs"
"shared" "shared"
"docker/jellyfin/data" "docker/jellyfin/data"

17
configs/common.nix
View File

@ -5,10 +5,11 @@
programs = { programs = {
nh = { nh = {
enable = true; enable = true;
# clean = { clean = {
# enable = true; enable = true;
# extraArgs = "--keep-since 14d --keep 5"; extraArgs = "--keep-since 14d --keep 5";
# }; };
flake = "/home/alex/nixos-config";
}; };
}; };
@ -113,6 +114,8 @@
unzip unzip
usbutils usbutils
wget wget
comma
]; ];
nix.settings = { nix.settings = {
@ -126,10 +129,4 @@
consoleLogLevel = 0; consoleLogLevel = 0;
kernel.sysctl = { "vm.max_map_count" = 262144; }; kernel.sysctl = { "vm.max_map_count" = 262144; };
}; };
nix.gc = {
automatic = true;
dates = "weekly";
options = "--delete-older-than 14d";
};
} }

17
configs/games.nix
View File

@ -4,7 +4,6 @@
gamescope = { gamescope = {
enable = true; enable = true;
capSysNice = false; capSysNice = false;
package = pkgs.gamescope;
}; };
gamemode = { gamemode = {
@ -14,7 +13,6 @@
steam = { steam = {
enable = true; enable = true;
# package = pkgs.unstable.steam;
extraPackages = with pkgs; [ extraPackages = with pkgs; [
gamescope gamescope
mangohud mangohud
@ -22,23 +20,18 @@
keyutils keyutils
]; ];
# extraCompatPackages = with pkgs; [ extraCompatPackages = with pkgs; [
# proton-ge-custom proton-ge-bin
# ]; ];
}; };
}; };
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
# (lutris.override {
# extraPkgs = pkgs: [
# pkgs.gamescope
# pkgs.mangohud
# ];
# })
lutris lutris
heroic heroic
vkbasalt
protontricks protontricks
protonup-qt protonup-qt
vulkan-tools vulkan-tools

5
configs/plasma-wayland.nix
View File

@ -8,7 +8,10 @@
}; };
environment = { environment = {
sessionVariables.NIXOS_OZONE_WL = "1"; sessionVariables = {
NIXOS_OZONE_WL = "1";
KWIN_DRM_DISABLE_TRIPLE_BUFFERING = "1";
};
plasma6.excludePackages = with pkgs.kdePackages; [ plasma6.excludePackages = with pkgs.kdePackages; [
plasma-browser-integration plasma-browser-integration
konsole konsole

1
configs/user-gui.nix
View File

@ -61,6 +61,7 @@
telegram-desktop telegram-desktop
discord discord
kdenlive
]; ];
home-manager.users.alex = { pkgs, ... }: { home-manager.users.alex = { pkgs, ... }: {

54
flake.lock generated
View File

@ -9,11 +9,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1726576520, "lastModified": 1727292492,
"narHash": "sha256-qkaiUpE3qRXunKbUzMaTGTMzF8nv534oglJY4a2hxNY=", "narHash": "sha256-vKkVoZJB35xOb1kmAH6i74ziuP0ZGKnzM6+NVi/OhD8=",
"owner": "chaotic-cx", "owner": "chaotic-cx",
"repo": "nyx", "repo": "nyx",
"rev": "4409a04839fc8c911ef3e461bb5f422ae1d03a85", "rev": "9b30ea4a39c8c5a2b6a6519f85da38f72b7f29f0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -32,11 +32,11 @@
"rust-analyzer-src": "rust-analyzer-src" "rust-analyzer-src": "rust-analyzer-src"
}, },
"locked": { "locked": {
"lastModified": 1726468443, "lastModified": 1726900127,
"narHash": "sha256-O1VcbVBrqIf58U05yFXl9+J7XM2qh0I+7vqMbNwZPq0=", "narHash": "sha256-v3r7yJY8YE4HAzD5DXOxLkzj8YZKQ0xuccp9yppGW1U=",
"owner": "nix-community", "owner": "nix-community",
"repo": "fenix", "repo": "fenix",
"rev": "effac20e9560aab202e82b6d833f685163a9c138", "rev": "18eefba7fd0bf03e115785948758a44125a9fd68",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -105,11 +105,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726440980, "lastModified": 1726902823,
"narHash": "sha256-ChhIrjtdu5d83W+YDRH+Ec5g1MmM0xk6hJnkz15Ot7M=", "narHash": "sha256-Gkc7pwTVLKj4HSvRt8tXNvosl8RS9hrBAEhOjAE0Tt4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "a9c9cc6e50f7cbd2d58ccb1cd46a1e06e9e445ff", "rev": "14929f7089268481d86b83ed31ffd88713dcd415",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -125,11 +125,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726825546, "lastModified": 1727383923,
"narHash": "sha256-HiBzfzgqojA9OjPB+vdi2o+gy4Zw/MEipuGopgGsZEw=", "narHash": "sha256-4/vacp3CwdGoPf8U4e/N8OsGYtO09WTcQK5FqYfJbKs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "0b052dd8119005c6ba819db48bcc657e48f401b7", "rev": "ffe2d07e771580a005e675108212597e5b367d2d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -148,11 +148,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726115155, "lastModified": 1726902390,
"narHash": "sha256-VDylz5VX4JD4/TZv6xUJDwuvNdgLRGoOpue1dlZGdIQ=", "narHash": "sha256-ESAD6AkxsQdV/j5ZBcO4Vg94J7Xd0nfpiEZpJtwSEhg=",
"owner": "Jovian-Experiments", "owner": "Jovian-Experiments",
"repo": "Jovian-NixOS", "repo": "Jovian-NixOS",
"rev": "02cf60ce20b6034fc0459e5116cec7016aaff6e4", "rev": "faf4c746c068dd8e41b1fa5f18beeabd34d4064c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -186,11 +186,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1726724509, "lastModified": 1727540359,
"narHash": "sha256-sVeAM1tgVi52S1e29fFBTPUAFSzgQwgLon3CrztXGm8=", "narHash": "sha256-U+225h1kJZpWb23+RaX1sBkqC4fA7aa7eBbgiQ5HcO4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "10d5e0ecc32984c1bf1a9a46586be3451c42fd94", "rev": "fb08bde00c20252b892a3e57fb094eb62b65ba61",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -202,11 +202,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1726463316, "lastModified": 1726937504,
"narHash": "sha256-gI9kkaH0ZjakJOKrdjaI/VbaMEo9qBbSUl93DnU7f4c=", "narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "99dc8785f6a0adac95f5e2ab05cc2e1bf666d172", "rev": "9357f4f23713673f310988025d9dc261c20e70c6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -234,11 +234,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1726755586, "lastModified": 1727348695,
"narHash": "sha256-PmUr/2GQGvFTIJ6/Tvsins7Q43KTMvMFhvG6oaYK+Wk=", "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c04d5652cfa9742b1d519688f65d1bbccea9eb7e", "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -283,11 +283,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1726524647, "lastModified": 1727423009,
"narHash": "sha256-qis6BtOOBBEAfUl7FMHqqTwRLB61OL5OFzIsOmRz2J4=", "narHash": "sha256-+4B/dQm2EnORIk0k2wV3aHGaE0WXTBjColXjj7qWh10=",
"owner": "mic92", "owner": "mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "e2d404a7ea599a013189aa42947f66cede0645c8", "rev": "127a96f49ddc377be6ba76964411bab11ae27803",
"type": "github" "type": "github"
}, },
"original": { "original": {

109
machine/desktop/configuration.nix
View File

@ -4,21 +4,7 @@ let
in in
{ {
nixpkgs = { nixpkgs = {
overlays = [ overlays = [ ];
(self: super: {
linuxPackages_cachyos = super.linuxPackages_cachyos.extend (lpself: lpsuper: {
xone = super.linuxPackages_cachyos.xone.overrideAttrs (oldAttrs: rec {
version = "0-unstable-latest";
src = pkgs.fetchFromGitHub {
owner = "tskaar";
repo = "xone";
rev = "28df566c38e0ee500fd5f74643fc35f21a4ff696";
hash = "sha256-++ScZiHnf8v7TjNBTQm7qGm3FALGp440avuQUuA86O4=";
};
});
});
})
];
config = { config = {
allowUnfree = true; allowUnfree = true;
}; };
@ -42,6 +28,8 @@ in
../../configs/user.nix ../../configs/user.nix
]; ];
chaotic.mesa-git.enable = true;
sops = { sops = {
defaultSopsFile = ../../secrets.yaml; defaultSopsFile = ../../secrets.yaml;
validateSopsFiles = true; validateSopsFiles = true;
@ -80,6 +68,8 @@ in
kernelPackages = pkgs.linuxPackages_cachyos; kernelPackages = pkgs.linuxPackages_cachyos;
extraModulePackages = with pkgs.linuxPackages_cachyos; [ it87 ]; extraModulePackages = with pkgs.linuxPackages_cachyos; [ it87 ];
# kernelPackages = pkgs.linuxPackages_6_9;
# extraModulePackages = with pkgs.linuxPackages_6_9; [ it87 ];
kernelModules = [ "it87" ]; kernelModules = [ "it87" ];
kernelParams = [ "amdgpu.ppfeaturemask=0xffffffff" ]; kernelParams = [ "amdgpu.ppfeaturemask=0xffffffff" ];
}; };
@ -130,22 +120,22 @@ in
enable32Bit = true; enable32Bit = true;
}; };
fancontrol = { # fancontrol = {
enable = true; # enable = true;
config = '' # config = ''
INTERVAL=10 # INTERVAL=10
DEVPATH=hwmon3=devices/platform/it87.656 # DEVPATH=hwmon3=devices/platform/it87.656
DEVNAME=hwmon3=it8665 # DEVNAME=hwmon3=it8665
FCTEMPS=hwmon3/pwm1=hwmon6/temp1_input hwmon3/pwm2=hwmon6/temp3_input hwmon3/pwm3=hwmon6/temp3_input # FCTEMPS=hwmon3/pwm1=hwmon6/temp1_input hwmon3/pwm2=hwmon6/temp3_input hwmon3/pwm3=hwmon6/temp3_input
FCFANS=hwmon3/pwm1=hwmon3/fan1_input hwmon3/pwm2=hwmon3/fan2_input hwmon3/pwm3=hwmon3/fan3_input # FCFANS=hwmon3/pwm1=hwmon3/fan1_input hwmon3/pwm2=hwmon3/fan2_input hwmon3/pwm3=hwmon3/fan3_input
MINTEMP=hwmon3/pwm1=60 hwmon3/pwm2=60 hwmon3/pwm3=60 # MINTEMP=hwmon3/pwm1=60 hwmon3/pwm2=60 hwmon3/pwm3=60
MAXTEMP=hwmon3/pwm1=80 hwmon3/pwm2=80 hwmon3/pwm3=80 # MAXTEMP=hwmon3/pwm1=80 hwmon3/pwm2=80 hwmon3/pwm3=80
MINSTART=hwmon3/pwm1=51 hwmon3/pwm2=102 hwmon3/pwm3=102 # MINSTART=hwmon3/pwm1=51 hwmon3/pwm2=102 hwmon3/pwm3=102
MINSTOP=hwmon3/pwm1=51 hwmon3/pwm2=102 hwmon3/pwm3=102 # MINSTOP=hwmon3/pwm1=51 hwmon3/pwm2=102 hwmon3/pwm3=102
MINPWM=hwmon3/pwm1=51 hwmon3/pwm2=102 hwmon3/pwm3=102 # MINPWM=hwmon3/pwm1=51 hwmon3/pwm2=102 hwmon3/pwm3=102
MAXPWM=hwmon3/pwm1=127 hwmon3/pwm2=127 hwmon3/pwm3=127 # MAXPWM=hwmon3/pwm1=127 hwmon3/pwm2=127 hwmon3/pwm3=127
''; # '';
}; # };
pulseaudio.enable = false; pulseaudio.enable = false;
}; };
@ -167,30 +157,34 @@ in
pulse.enable = true; pulse.enable = true;
}; };
# samba = { samba = {
# enable = true; enable = true;
# securityType = "user"; settings = {
# extraConfig = '' global = {
# workgroup = WORKGROUP workgroup = "WORKGROUP";
# server string = server "server string" = "server";
# netbios name = server "netbios name" = "server";
# security = user security = "user";
# guest account = nobody "guest account" = "nobody";
# map to guest = bad user "map to guest" = "bad user";
# logging = systemd logging = "systemd";
# max log size = 50 "max log size" = 50;
# ''; "invalid users" = [
# shares = { "root"
# storage = { ];
# path = "/home/alex/shared/storage"; "passwd program" = "/run/wrappers/bin/passwd %u";
# browseable = "yes"; };
# "read only" = "no"; shares = {
# "guest ok" = "no"; browseable = "yes";
# "create mask" = "0644"; "guest ok" = "no";
# "directory mask" = "0755"; path = "/home/alex/shared/storage";
# }; "read only" = "no";
# }; "create mask" = "0644";
# }; "directory mask" = "0755";
};
};
};
tailscale.enable = true; tailscale.enable = true;
@ -216,5 +210,10 @@ in
}; };
}; };
swapDevices = [{
device = "/swapfile";
size = 32 * 1024;
}];
system.stateVersion = "24.11"; system.stateVersion = "24.11";
} }