diff --git a/README.md b/README.md index 7d30a77..701759a 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,5 @@ # 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 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-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== -``` \ No newline at end of file +``` + +### Commands + + +``` +sudo nix-collect-garbage -d + +sudo nix-env -p /nix/var/nix/profiles/system --list-generations +``` diff --git a/configs/borg-exclude.nix b/configs/borg-exclude.nix index ac930b9..efecbea 100755 --- a/configs/borg-exclude.nix +++ b/configs/borg-exclude.nix @@ -1,17 +1,15 @@ { borg-exclude = [ ".cache" - ".config/chromium/Default/Service Worker/CacheStorage" - ".config/discord/Cache" - ".local/share/libvirt/images" - ".local/share/Steam/config/htmlcache/Cache" - ".local/share/Steam/steamapps" + ".local/share/Steam" ".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-second/drive_c/Program Files/Guild Wars/Gw.dat" + "Nextcloud" + "VirtualBox VMs" "shared" "docker/jellyfin/data" diff --git a/configs/common.nix b/configs/common.nix index dd84ce7..af87696 100755 --- a/configs/common.nix +++ b/configs/common.nix @@ -5,10 +5,11 @@ programs = { nh = { enable = true; - # clean = { - # enable = true; - # extraArgs = "--keep-since 14d --keep 5"; - # }; + clean = { + enable = true; + extraArgs = "--keep-since 14d --keep 5"; + }; + flake = "/home/alex/nixos-config"; }; }; @@ -113,6 +114,8 @@ unzip usbutils wget + + comma ]; nix.settings = { @@ -126,10 +129,4 @@ consoleLogLevel = 0; kernel.sysctl = { "vm.max_map_count" = 262144; }; }; - - nix.gc = { - automatic = true; - dates = "weekly"; - options = "--delete-older-than 14d"; - }; } diff --git a/configs/games.nix b/configs/games.nix index 4058de8..eb6903a 100755 --- a/configs/games.nix +++ b/configs/games.nix @@ -4,7 +4,6 @@ gamescope = { enable = true; capSysNice = false; - package = pkgs.gamescope; }; gamemode = { @@ -14,7 +13,6 @@ steam = { enable = true; - # package = pkgs.unstable.steam; extraPackages = with pkgs; [ gamescope mangohud @@ -22,23 +20,18 @@ keyutils ]; - # extraCompatPackages = with pkgs; [ - # proton-ge-custom - # ]; + extraCompatPackages = with pkgs; [ + proton-ge-bin + ]; }; }; environment.systemPackages = with pkgs; [ - # (lutris.override { - # extraPkgs = pkgs: [ - # pkgs.gamescope - # pkgs.mangohud - # ]; - # }) - lutris heroic + vkbasalt + protontricks protonup-qt vulkan-tools diff --git a/configs/plasma-wayland.nix b/configs/plasma-wayland.nix index 18f1e7a..9f126f4 100755 --- a/configs/plasma-wayland.nix +++ b/configs/plasma-wayland.nix @@ -8,7 +8,10 @@ }; environment = { - sessionVariables.NIXOS_OZONE_WL = "1"; + sessionVariables = { + NIXOS_OZONE_WL = "1"; + KWIN_DRM_DISABLE_TRIPLE_BUFFERING = "1"; + }; plasma6.excludePackages = with pkgs.kdePackages; [ plasma-browser-integration konsole diff --git a/configs/user-gui.nix b/configs/user-gui.nix index 37ef0d8..c4b8ae2 100755 --- a/configs/user-gui.nix +++ b/configs/user-gui.nix @@ -61,6 +61,7 @@ telegram-desktop discord + kdenlive ]; home-manager.users.alex = { pkgs, ... }: { diff --git a/flake.lock b/flake.lock index 079ef81..5159ffd 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1726576520, - "narHash": "sha256-qkaiUpE3qRXunKbUzMaTGTMzF8nv534oglJY4a2hxNY=", + "lastModified": 1727292492, + "narHash": "sha256-vKkVoZJB35xOb1kmAH6i74ziuP0ZGKnzM6+NVi/OhD8=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "4409a04839fc8c911ef3e461bb5f422ae1d03a85", + "rev": "9b30ea4a39c8c5a2b6a6519f85da38f72b7f29f0", "type": "github" }, "original": { @@ -32,11 +32,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1726468443, - "narHash": "sha256-O1VcbVBrqIf58U05yFXl9+J7XM2qh0I+7vqMbNwZPq0=", + "lastModified": 1726900127, + "narHash": "sha256-v3r7yJY8YE4HAzD5DXOxLkzj8YZKQ0xuccp9yppGW1U=", "owner": "nix-community", "repo": "fenix", - "rev": "effac20e9560aab202e82b6d833f685163a9c138", + "rev": "18eefba7fd0bf03e115785948758a44125a9fd68", "type": "github" }, "original": { @@ -105,11 +105,11 @@ ] }, "locked": { - "lastModified": 1726440980, - "narHash": "sha256-ChhIrjtdu5d83W+YDRH+Ec5g1MmM0xk6hJnkz15Ot7M=", + "lastModified": 1726902823, + "narHash": "sha256-Gkc7pwTVLKj4HSvRt8tXNvosl8RS9hrBAEhOjAE0Tt4=", "owner": "nix-community", "repo": "home-manager", - "rev": "a9c9cc6e50f7cbd2d58ccb1cd46a1e06e9e445ff", + "rev": "14929f7089268481d86b83ed31ffd88713dcd415", "type": "github" }, "original": { @@ -125,11 +125,11 @@ ] }, "locked": { - "lastModified": 1726825546, - "narHash": "sha256-HiBzfzgqojA9OjPB+vdi2o+gy4Zw/MEipuGopgGsZEw=", + "lastModified": 1727383923, + "narHash": "sha256-4/vacp3CwdGoPf8U4e/N8OsGYtO09WTcQK5FqYfJbKs=", "owner": "nix-community", "repo": "home-manager", - "rev": "0b052dd8119005c6ba819db48bcc657e48f401b7", + "rev": "ffe2d07e771580a005e675108212597e5b367d2d", "type": "github" }, "original": { @@ -148,11 +148,11 @@ ] }, "locked": { - "lastModified": 1726115155, - "narHash": "sha256-VDylz5VX4JD4/TZv6xUJDwuvNdgLRGoOpue1dlZGdIQ=", + "lastModified": 1726902390, + "narHash": "sha256-ESAD6AkxsQdV/j5ZBcO4Vg94J7Xd0nfpiEZpJtwSEhg=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "02cf60ce20b6034fc0459e5116cec7016aaff6e4", + "rev": "faf4c746c068dd8e41b1fa5f18beeabd34d4064c", "type": "github" }, "original": { @@ -186,11 +186,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1726724509, - "narHash": "sha256-sVeAM1tgVi52S1e29fFBTPUAFSzgQwgLon3CrztXGm8=", + "lastModified": 1727540359, + "narHash": "sha256-U+225h1kJZpWb23+RaX1sBkqC4fA7aa7eBbgiQ5HcO4=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "10d5e0ecc32984c1bf1a9a46586be3451c42fd94", + "rev": "fb08bde00c20252b892a3e57fb094eb62b65ba61", "type": "github" }, "original": { @@ -202,11 +202,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1726463316, - "narHash": "sha256-gI9kkaH0ZjakJOKrdjaI/VbaMEo9qBbSUl93DnU7f4c=", + "lastModified": 1726937504, + "narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "99dc8785f6a0adac95f5e2ab05cc2e1bf666d172", + "rev": "9357f4f23713673f310988025d9dc261c20e70c6", "type": "github" }, "original": { @@ -234,11 +234,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1726755586, - "narHash": "sha256-PmUr/2GQGvFTIJ6/Tvsins7Q43KTMvMFhvG6oaYK+Wk=", + "lastModified": 1727348695, + "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c04d5652cfa9742b1d519688f65d1bbccea9eb7e", + "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784", "type": "github" }, "original": { @@ -283,11 +283,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1726524647, - "narHash": "sha256-qis6BtOOBBEAfUl7FMHqqTwRLB61OL5OFzIsOmRz2J4=", + "lastModified": 1727423009, + "narHash": "sha256-+4B/dQm2EnORIk0k2wV3aHGaE0WXTBjColXjj7qWh10=", "owner": "mic92", "repo": "sops-nix", - "rev": "e2d404a7ea599a013189aa42947f66cede0645c8", + "rev": "127a96f49ddc377be6ba76964411bab11ae27803", "type": "github" }, "original": { diff --git a/machine/desktop/configuration.nix b/machine/desktop/configuration.nix index 67c10d7..562453a 100755 --- a/machine/desktop/configuration.nix +++ b/machine/desktop/configuration.nix @@ -4,21 +4,7 @@ let in { nixpkgs = { - 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="; - }; - }); - }); - }) - ]; + overlays = [ ]; config = { allowUnfree = true; }; @@ -42,6 +28,8 @@ in ../../configs/user.nix ]; + chaotic.mesa-git.enable = true; + sops = { defaultSopsFile = ../../secrets.yaml; validateSopsFiles = true; @@ -80,6 +68,8 @@ in kernelPackages = pkgs.linuxPackages_cachyos; extraModulePackages = with pkgs.linuxPackages_cachyos; [ it87 ]; + # kernelPackages = pkgs.linuxPackages_6_9; + # extraModulePackages = with pkgs.linuxPackages_6_9; [ it87 ]; kernelModules = [ "it87" ]; kernelParams = [ "amdgpu.ppfeaturemask=0xffffffff" ]; }; @@ -130,22 +120,22 @@ in enable32Bit = true; }; - fancontrol = { - enable = true; - config = '' - INTERVAL=10 - DEVPATH=hwmon3=devices/platform/it87.656 - DEVNAME=hwmon3=it8665 - 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 - MINTEMP=hwmon3/pwm1=60 hwmon3/pwm2=60 hwmon3/pwm3=60 - MAXTEMP=hwmon3/pwm1=80 hwmon3/pwm2=80 hwmon3/pwm3=80 - MINSTART=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 - MAXPWM=hwmon3/pwm1=127 hwmon3/pwm2=127 hwmon3/pwm3=127 - ''; - }; + # fancontrol = { + # enable = true; + # config = '' + # INTERVAL=10 + # DEVPATH=hwmon3=devices/platform/it87.656 + # DEVNAME=hwmon3=it8665 + # 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 + # MINTEMP=hwmon3/pwm1=60 hwmon3/pwm2=60 hwmon3/pwm3=60 + # MAXTEMP=hwmon3/pwm1=80 hwmon3/pwm2=80 hwmon3/pwm3=80 + # MINSTART=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 + # MAXPWM=hwmon3/pwm1=127 hwmon3/pwm2=127 hwmon3/pwm3=127 + # ''; + # }; pulseaudio.enable = false; }; @@ -167,30 +157,34 @@ in pulse.enable = true; }; - # samba = { - # enable = true; - # securityType = "user"; - # extraConfig = '' - # workgroup = WORKGROUP - # server string = server - # netbios name = server - # security = user - # guest account = nobody - # map to guest = bad user - # logging = systemd - # max log size = 50 - # ''; - # shares = { - # storage = { - # path = "/home/alex/shared/storage"; - # browseable = "yes"; - # "read only" = "no"; - # "guest ok" = "no"; - # "create mask" = "0644"; - # "directory mask" = "0755"; - # }; - # }; - # }; + samba = { + enable = true; + settings = { + global = { + workgroup = "WORKGROUP"; + "server string" = "server"; + "netbios name" = "server"; + security = "user"; + "guest account" = "nobody"; + "map to guest" = "bad user"; + logging = "systemd"; + "max log size" = 50; + "invalid users" = [ + "root" + ]; + "passwd program" = "/run/wrappers/bin/passwd %u"; + }; + shares = { + browseable = "yes"; + "guest ok" = "no"; + path = "/home/alex/shared/storage"; + "read only" = "no"; + "create mask" = "0644"; + "directory mask" = "0755"; + + }; + }; + }; tailscale.enable = true; @@ -216,5 +210,10 @@ in }; }; + swapDevices = [{ + device = "/swapfile"; + size = 32 * 1024; + }]; + system.stateVersion = "24.11"; }