diff --git a/flake.lock b/flake.lock index a15a828..b1365de 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1731774881, - "narHash": "sha256-1Dxryiw8u2ejntxrrv3sMtIE8WHKxmlN4KeH+uMGbmc=", + "lastModified": 1731959031, + "narHash": "sha256-TGcvIjftziC1CjuiHCzrYDwmOoSFYIhdiKmLetzB5L0=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "b31a6a4da8199ae3489057db7d36069a70749a56", + "rev": "4468981c1c50999f315baa1508f0e53c4ee70c52", "type": "github" }, "original": { @@ -55,11 +55,11 @@ ] }, "locked": { - "lastModified": 1732109232, - "narHash": "sha256-iYh6h8yueU8IyOfNclbiBG2+fBFcjjUfXm90ZBzk0c0=", + "lastModified": 1732988076, + "narHash": "sha256-2uMaVAZn7fiyTUGhKgleuLYe5+EAAYB/diKxrM7g3as=", "owner": "nix-community", "repo": "disko", - "rev": "a0c384e0a3b8bcaed30a6bcf3783f8a7c8b35be4", + "rev": "2814a5224a47ca19e858e027f7e8bff74a8ea9f1", "type": "github" }, "original": { @@ -135,41 +135,6 @@ "type": "github" } }, - "flake-utils_2": { - "inputs": { - "systems": "systems_3" - }, - "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "freetype2": { - "flake": false, - "locked": { - "lastModified": 1687587065, - "narHash": "sha256-+Fh+/k+NWL5Ow9sDLtp8Cv/8rLNA1oByQQCIQS/bysY=", - "owner": "wez", - "repo": "freetype2", - "rev": "e4586d960f339cf75e2e0b34aee30a0ed8353c0d", - "type": "github" - }, - "original": { - "owner": "wez", - "repo": "freetype2", - "rev": "e4586d960f339cf75e2e0b34aee30a0ed8353c0d", - "type": "github" - } - }, "git-hooks": { "inputs": { "flake-compat": "flake-compat", @@ -284,11 +249,11 @@ }, "hardware": { "locked": { - "lastModified": 1731797098, - "narHash": "sha256-UhWmEZhwJZmVZ1jfHZFzCg+ZLO9Tb/v3Y6LC0UNyeTo=", + "lastModified": 1733139194, + "narHash": "sha256-PVQW9ovo0CJbhuhCsrhFJGGdD1euwUornspKpBIgdok=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "672ac2ac86f7dff2f6f3406405bddecf960e0db6", + "rev": "c6c90887f84c02ce9ebf33b95ca79ef45007bf88", "type": "github" }, "original": { @@ -297,23 +262,6 @@ "type": "github" } }, - "harfbuzz": { - "flake": false, - "locked": { - "lastModified": 1711722720, - "narHash": "sha256-GdxcAPx5QyniSHPAN1ih28AD9JLUPR0ItqW9JEsl3pU=", - "owner": "harfbuzz", - "repo": "harfbuzz", - "rev": "63973005bc07aba599b47fdd4cf788647b601ccd", - "type": "github" - }, - "original": { - "owner": "harfbuzz", - "ref": "8.4.0", - "repo": "harfbuzz", - "type": "github" - } - }, "helix": { "inputs": { "crane": "crane", @@ -322,11 +270,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1731479417, - "narHash": "sha256-NZ+Jc9XecxUIC6RBE5TdDo8hKzI704fMBKTz6lEH32w=", + "lastModified": 1733164621, + "narHash": "sha256-AhYHB343nLY4bkm9yyOT9I7LIg799ouuIBWb31gORcA=", "owner": "helix-editor", "repo": "helix", - "rev": "6cca98264fe308bd6a4f7f85be2d821b58f60b4a", + "rev": "c0bfdd7bfe8b5a3d13e7e8631eec2e8ea0b726a5", "type": "github" }, "original": { @@ -343,16 +291,16 @@ ] }, "locked": { - "lastModified": 1726989464, - "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", + "lastModified": 1733050161, + "narHash": "sha256-lYnT+EYE47f5yY3KS/Kd4pJ6CO9fhCqumkYYkQ3TK20=", "owner": "nix-community", "repo": "home-manager", - "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", + "rev": "62d536255879be574ebfe9b87c4ac194febf47c5", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.05", + "ref": "release-24.11", "repo": "home-manager", "type": "github" } @@ -364,11 +312,11 @@ ] }, "locked": { - "lastModified": 1732025103, - "narHash": "sha256-qjEI64RKvDxRyEarY0jTzrZMa8ebezh2DEZmJJrpVdo=", + "lastModified": 1733133928, + "narHash": "sha256-gU40r9AfpIr4eq+0noM8yH1Hxf+EA3dqfIpFtQl8Y1E=", "owner": "nix-community", "repo": "home-manager", - "rev": "a46e702093a5c46e192243edbd977d5749e7f294", + "rev": "873e39d5f4437d2f3ab06881fea8e63e45e1d011", "type": "github" }, "original": { @@ -420,11 +368,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1732100541, - "narHash": "sha256-ryxqTo2N5EOwHjrDXCoVFKuG1ZKpoMlRmCjqqUhjQPU=", + "lastModified": 1733157082, + "narHash": "sha256-rmJkUKyvaejRaQeEOpInjGjQv6rgFkm2uJ2iVlMEuOk=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "940f7aa990dbc99815bab8d355999d8277534b17", + "rev": "92186898c0ca1b3f72922b72c4af1723f0d9b888", "type": "github" }, "original": { @@ -499,11 +447,11 @@ ] }, "locked": { - "lastModified": 1731702627, - "narHash": "sha256-+JeO9gevnXannQxMfR5xzZtF4sYmSlWkX/BPmPx0mWk=", + "lastModified": 1732288281, + "narHash": "sha256-XTU9B53IjGeJiJ7LstOhuxcRjCOFkQFl01H78sT9Lg4=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "e911361a687753bbbdfe3b6a9eab755ecaf1d9e1", + "rev": "b26f33cc1c8a7fd5076e19e2cce3f062dca6351c", "type": "github" }, "original": { @@ -545,11 +493,11 @@ ] }, "locked": { - "lastModified": 1732032028, - "narHash": "sha256-NjyfJQQxs/a2a/KwTmXM44K7XjeJwGsf4YFtebueQzo=", + "lastModified": 1732739177, + "narHash": "sha256-iL32+TA/8geCzcL1r3uthrH/GPvbUak5QE++WJUkaiI=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "65dc04371cf914c9af4f073638821e4787303005", + "rev": "8d7b2149e618696d5100c2683af1ffa893f02a75", "type": "github" }, "original": { @@ -559,23 +507,6 @@ "type": "github" } }, - "libpng": { - "flake": false, - "locked": { - "lastModified": 1549245649, - "narHash": "sha256-1+cRp0Ungme/OGfc9kGJbklYIWAFxk8Il1M+NV4KSgw=", - "owner": "glennrp", - "repo": "libpng", - "rev": "8439534daa1d3a5705ba92e653eda9251246dd61", - "type": "github" - }, - "original": { - "owner": "glennrp", - "repo": "libpng", - "rev": "8439534daa1d3a5705ba92e653eda9251246dd61", - "type": "github" - } - }, "mobile-nixos": { "flake": false, "locked": { @@ -680,11 +611,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1731890469, - "narHash": "sha256-D1FNZ70NmQEwNxpSSdTXCSklBH1z2isPR84J6DQrJGs=", + "lastModified": 1733064805, + "narHash": "sha256-7NbtSLfZO0q7MXPl5hzA0sbVJt6pWxxtGWbaVUDDmjs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5083ec887760adfe12af64830a66807423a859a7", + "rev": "31d66ae40417bb13765b0ad75dd200400e98de84", "type": "github" }, "original": { @@ -696,11 +627,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1731676054, - "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", + "lastModified": 1732758367, + "narHash": "sha256-RzaI1RO0UXqLjydtz3GAXSTzHkpb/lLD1JD8a0W4Wpo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", + "rev": "fa42b5a5f401aab8a32bd33c9a4de0738180dc59", "type": "github" }, "original": { @@ -712,16 +643,16 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1731797254, - "narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=", + "lastModified": 1732981179, + "narHash": "sha256-F7thesZPvAMSwjRu0K8uFshTk3ZZSNAsXTIFvXBT+34=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59", + "rev": "62c435d93bf046a5396f3016472e8f7c8e2aed65", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } @@ -737,11 +668,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1731363552, - "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", + "lastModified": 1732021966, + "narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", + "rev": "3308484d1a443fc5bc92012435d79e80458fe43c", "type": "github" }, "original": { @@ -764,8 +695,7 @@ "nixpkgs": "nixpkgs_3", "nixpkgs-unstable": "nixpkgs-unstable", "slippi": "slippi", - "sops-nix": "sops-nix", - "wezterm": "wezterm" + "sops-nix": "sops-nix" } }, "rust-overlay": { @@ -789,27 +719,6 @@ "type": "github" } }, - "rust-overlay_2": { - "inputs": { - "nixpkgs": [ - "wezterm", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1729477859, - "narHash": "sha256-r0VyeJxy4O4CgTB/PNtfQft9fPfN1VuGvnZiCxDArvg=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "ada8266712449c4c0e6ee6fcbc442b3c217c79e1", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, "slippi": { "inputs": { "git-hooks": "git-hooks_2", @@ -841,11 +750,11 @@ ] }, "locked": { - "lastModified": 1731954233, - "narHash": "sha256-vvXx1m2Rsw7MkbKJdpcICzz4YPgZPApGKQGhNZfkhOI=", + "lastModified": 1733128155, + "narHash": "sha256-m6/qwJAJYcidGMEdLqjKzRIjapK4nUfMq7rDCTmZajc=", "owner": "Mic92", "repo": "sops-nix", - "rev": "e39947d0ee8e341fa7108bd02a33cdfa24a1360e", + "rev": "c6134b6fff6bda95a1ac872a2a9d5f32e3c37856", "type": "github" }, "original": { @@ -884,49 +793,6 @@ "type": "github" } }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "wezterm": { - "inputs": { - "flake-utils": "flake-utils_2", - "freetype2": "freetype2", - "harfbuzz": "harfbuzz", - "libpng": "libpng", - "nixpkgs": [ - "nixpkgs-unstable" - ], - "rust-overlay": "rust-overlay_2", - "zlib": "zlib" - }, - "locked": { - "dir": "nix", - "lastModified": 1732036472, - "narHash": "sha256-8lv1bc7Lw5S7UFOduShwSHfBzB4Vl0ex22Cb+q/qLi0=", - "owner": "wez", - "repo": "wezterm", - "rev": "4050072da21cc3106d0985281d75978c07e22abc", - "type": "github" - }, - "original": { - "dir": "nix", - "owner": "wez", - "repo": "wezterm", - "type": "github" - } - }, "xdph": { "inputs": { "hyprland-protocols": [ @@ -967,23 +833,6 @@ "repo": "xdg-desktop-portal-hyprland", "type": "github" } - }, - "zlib": { - "flake": false, - "locked": { - "lastModified": 1484501380, - "narHash": "sha256-j5b6aki1ztrzfCqu8y729sPar8GpyQWIrajdzpJC+ww=", - "owner": "madler", - "repo": "zlib", - "rev": "cacf7f1d4e3d44d871b605da3b647f07d718623f", - "type": "github" - }, - "original": { - "owner": "madler", - "ref": "v1.2.11", - "repo": "zlib", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 360137a..9da6d23 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,6 @@ { inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable"; disko.url = "github:nix-community/disko/master"; @@ -13,7 +13,7 @@ git-hooks.url = "github:cachix/git-hooks.nix"; git-hooks.inputs.nixpkgs.follows = "nixpkgs"; - home-manager.url = "github:nix-community/home-manager/release-24.05"; + home-manager.url = "github:nix-community/home-manager/release-24.11"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; home-manager-unstable.url = "github:nix-community/home-manager"; @@ -23,8 +23,8 @@ hardware.url = "github:nixos/nixos-hardware"; hyprland.url = "github:hyprwm/Hyprland"; - wezterm.url = "github:wez/wezterm?dir=nix"; - wezterm.inputs.nixpkgs.follows = "nixpkgs-unstable"; + # wezterm.url = "github:wez/wezterm?dir=nix"; + # wezterm.inputs.nixpkgs.follows = "nixpkgs-unstable"; slippi.url = "github:lytedev/slippi-nix"; # slippi.url = "git+file:///home/daniel/code/open-source/slippi-nix"; @@ -69,7 +69,7 @@ disko, sops-nix, git-hooks, - wezterm, + # wezterm, home-manager, home-manager-unstable, helix, @@ -183,7 +183,7 @@ nodejs wget sudo - nixFlakes + nixVersions.stable cacert gnutar gzip @@ -230,9 +230,11 @@ }; }; - modifications = final: prev: let - wezterm-input = wezterm; - in rec { + modifications = final: prev: + # let + # wezterm-input = wezterm; + # in + rec { helix = helix.outputs.packages.${prev.system}.helix; final.helix = helix; /* @@ -241,25 +243,25 @@ not-yet-merged (abandoned?): https://github.com/wez/wezterm/pull/4737 I did try using the latest code via the flake, but alas it did not resolve my issues with mux'ing */ - wezterm = wezterm-input.outputs.packages.${prev.system}.default; + # wezterm = wezterm-input.outputs.packages.${prev.system}.default; # wezterm = (import nixpkgs {inherit (prev) system;}).wezterm; - final.wezterm = wezterm; + # final.wezterm = wezterm; - zellij = prev.zellij.overrideAttrs rec { - version = "0.41.0"; - src = prev.fetchFromGitHub { - owner = "zellij-org"; - repo = "zellij"; - rev = "v0.41.0"; - hash = "sha256-A+JVWYz0t9cVA8XZciOwDkCecsC2r5TU2O9i9rVg7do="; - }; - cargoDeps = prev.zellij.cargoDeps.overrideAttrs (prev.lib.const { - name = "zellij-vendor.tar.gz"; - inherit src; - outputHash = "sha256-WxrMI7fV0pNsGjbNpXLr+xnMdWYkC4WxIeN4OK3ZPIE="; - }); - }; - final.zellij = zellij; + # zellij = prev.zellij.overrideAttrs rec { + # version = "0.41.0"; + # src = prev.fetchFromGitHub { + # owner = "zellij-org"; + # repo = "zellij"; + # rev = "v0.41.0"; + # hash = "sha256-A+JVWYz0t9cVA8XZciOwDkCecsC2r5TU2O9i9rVg7do="; + # }; + # cargoDeps = prev.zellij.cargoDeps.overrideAttrs (prev.lib.const { + # name = "zellij-vendor.tar.gz"; + # inherit src; + # outputHash = "sha256-WxrMI7fV0pNsGjbNpXLr+xnMdWYkC4WxIeN4OK3ZPIE="; + # }); + # }; + # final.zellij = zellij; }; unstable-packages = final: _prev: { @@ -336,6 +338,7 @@ virtual-machines virtual-machines-gui music-production + plasma6 gaming slippi.nixosModules.default diff --git a/modules/home-manager/hyprland.nix b/modules/home-manager/hyprland.nix index 31a6f95..f76bdd5 100644 --- a/modules/home-manager/hyprland.nix +++ b/modules/home-manager/hyprland.nix @@ -99,8 +99,8 @@ in { follow_mouse = 2; - repeat_delay = 200; - repeat_rate = 60; + repeat_delay = 180; + repeat_rate = 120; touchpad = { natural_scroll = "yes"; diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index f4f4e6b..7d5c3ca 100644 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -695,8 +695,13 @@ }; fonts = {pkgs, ...}: { - fonts.packages = with pkgs; [ - (nerdfonts.override {fonts = ["NerdFontsSymbolsOnly"];}) + fonts.packages = [ + ( + # allow nixpkgs 24.11 and unstable to both work + if builtins.hasAttr "nerd-fonts" pkgs + then (pkgs.nerd-fonts.symbols-only) + else (pkgs.nerdfonts.override {fonts = ["NerdFontsSymbolsOnly"];}) + ) pkgs.iosevkaLyteTerm ]; }; @@ -1188,7 +1193,7 @@ root ]; - boot.tmp.useTmpfs = true; + # boot.tmp.useTmpfs = true; systemd.services.nix-daemon = { environment.TMPDIR = "/var/tmp"; }; diff --git a/nixos/beefcake.nix b/nixos/beefcake.nix index 66676e6..d5c5ca2 100644 --- a/nixos/beefcake.nix +++ b/nixos/beefcake.nix @@ -35,7 +35,7 @@ sudo nix run nixpkgs#ipmitool -- raw 0x30 0x30 0x02 0xff 0x00 initrd.supportedFilesystems = { zfs = true; }; - kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages; + # kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages; initrd.availableKernelModules = ["ehci_pci" "mpt3sas" "usbhid" "sd_mod"]; kernelModules = ["kvm-intel"]; kernelParams = ["nohibernate"]; @@ -268,7 +268,7 @@ sudo nix run nixpkgs#ipmitool -- raw 0x30 0x30 0x02 0xff 0x00 ]; }; services.nextcloud = { - enable = true; + enable = false; hostName = "nextcloud.h.lyte.dev"; maxUploadSize = "100G"; extraAppsEnable = true; @@ -304,9 +304,11 @@ sudo nix run nixpkgs#ipmitool -- raw 0x30 0x30 0x02 0xff 0x00 serviceConfig.Group = "nextcloud"; }; - services.phpfpm.pools.nextcloud.settings = { - "listen.owner" = "caddy"; - "listen.group" = "caddy"; + services.phpfpm = lib.mkIf config.services.nextcloud.enable { + pools.nextcloud.settings = { + "listen.owner" = "caddy"; + "listen.group" = "caddy"; + }; }; services.caddy.virtualHosts."nextcloud.h.lyte.dev" = let @@ -1767,7 +1769,7 @@ sudo nix run nixpkgs#ipmitool -- raw 0x30 0x30 0x02 0xff 0x00 services.paperless = { enable = true; - package = pkgs.paperless-ngx; + # package = pkgs.paperless-ngx; dataDir = "/storage/paperless"; passwordFile = config.sops.secrets.paperless-superuser-password.path; }; diff --git a/nixos/dragon.nix b/nixos/dragon.nix index 593a5e5..ebf47d4 100644 --- a/nixos/dragon.nix +++ b/nixos/dragon.nix @@ -6,7 +6,7 @@ }: { imports = [ { - system.stateVersion = "24.05"; + system.stateVersion = "24.11"; home-manager.users.daniel.home.stateVersion = "24.05"; networking.hostName = "dragon"; } @@ -31,6 +31,14 @@ }; } ]; + hardware.amdgpu = { + amdvlk = { + enable = true; + support32Bit = { + enable = true; + }; + }; + }; hardware.graphics.extraPackages = [ # pkgs.rocmPackages.clr.icd pkgs.amdvlk @@ -96,7 +104,7 @@ wayland.windowManager.hyprland = { settings = { env = [ - "EWW_BAR_MON,1" + "EWW_BAR_MON,0" ]; # See https://wiki.hyprland.org/Configuring/Keywords/ for more monitor = [ @@ -108,7 +116,7 @@ "desc:LG Display 0x0521,3840x2160@120,0x0,1" "desc:Dell Inc. DELL U2720Q D3TM623,3840x2160@60,3840x0,1.5,transform,1" */ - "DP-2,3840x2160@60,0x0,1.5,transform,1" + "DP-1,3840x2160@60,0x0,1.5,transform,1" ]; input = { force_no_accel = true; diff --git a/nixos/foxtrot.nix b/nixos/foxtrot.nix index 1d72177..9a48d1d 100644 --- a/nixos/foxtrot.nix +++ b/nixos/foxtrot.nix @@ -341,6 +341,15 @@ in pkgs.vaapiVdpau ]; + hardware.amdgpu = { + amdvlk = { + enable = true; + support32Bit = { + enable = true; + }; + }; + }; + networking.networkmanager.wifi.powersave = false; hardware.framework.amd-7040.preventWakeOnAC = true;