From 3f62b901bdd3b1f69b7f2e3d9892b6a5533d5568 Mon Sep 17 00:00:00 2001 From: blahai Date: Thu, 12 Dec 2024 20:31:32 +0200 Subject: [PATCH] A lot of changes I cba to document --- .gitignore | 1 + flake.lock | 224 +++++++++++++++++------------ flake.nix | 4 - hosts/epimetheus/configuration.nix | 12 +- hosts/nyx/configuration.nix | 29 ++-- modules/nixos/games/default.nix | 4 +- modules/nixos/services/default.nix | 2 +- 7 files changed, 162 insertions(+), 114 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b2be92b --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +result diff --git a/flake.lock b/flake.lock index ee422c6..7e45046 100644 --- a/flake.lock +++ b/flake.lock @@ -57,11 +57,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1733001911, - "narHash": "sha256-uX/9m0TbdhEzuWA0muM5mI/AaWcLiDLjCCyu5Qr9MRk=", + "lastModified": 1733908662, + "narHash": "sha256-vuyqYX91/kEs+oYAw0az5A/JHeIX8hrv06WtLmhfZ5A=", "owner": "catppuccin", "repo": "nix", - "rev": "a817009ebfd2cca7f70a77884e5098d0a8c83f8e", + "rev": "5dfc780ad24353d01161c3c5784200ef042019af", "type": "github" }, "original": { @@ -78,11 +78,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1733319615, - "narHash": "sha256-QWQPdJiC6ab3J2rThuLoFJivkEOvMNkzOIn5qJLhIQg=", + "lastModified": 1733967201, + "narHash": "sha256-gfA/6BUhFmrfTMaTNToHm5Lm9c/snG7ED4W/x4vCGJs=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "d6a32b476215dbe915ccfa123fcd16d59d21a2c6", + "rev": "1559608a73a9211c7f78e7a0a8c13caca9f31006", "type": "github" }, "original": { @@ -121,11 +121,11 @@ ] }, "locked": { - "lastModified": 1733168902, - "narHash": "sha256-8dupm9GfK+BowGdQd7EHK5V61nneLfr9xR6sc5vtDi0=", + "lastModified": 1734011192, + "narHash": "sha256-NghuiWXx6Q3gwLiudiNwDpYQ1CPEUK7J+f9dWREN8KA=", "owner": "nix-community", "repo": "disko", - "rev": "785c1e02c7e465375df971949b8dcbde9ec362e5", + "rev": "0f31ad735e784315a22d9899d3ba24340ce64220", "type": "github" }, "original": { @@ -183,6 +183,27 @@ "type": "github" } }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "nur", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-schemas": { "locked": { "lastModified": 1721999734, @@ -217,7 +238,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_6" + "systems": "systems_5" }, "locked": { "lastModified": 1726560853, @@ -312,11 +333,11 @@ ] }, "locked": { - "lastModified": 1733175814, - "narHash": "sha256-zFOtOaqjzZfPMsm1mwu98syv3y+jziAq5DfWygaMtLg=", + "lastModified": 1733873195, + "narHash": "sha256-dTosiZ3sZ/NKoLKQ++v8nZdEHya0eTNEsaizNp+MUPM=", "owner": "nix-community", "repo": "home-manager", - "rev": "bf23fe41082aa0289c209169302afd3397092f22", + "rev": "f26aa4b76fb7606127032d33ac73d7d507d82758", "type": "github" }, "original": { @@ -332,11 +353,11 @@ ] }, "locked": { - "lastModified": 1733389730, - "narHash": "sha256-KZMu4ddMll5khS0rYkJsVD0hVqjMNHlhTM3PCQar0Ag=", + "lastModified": 1733951607, + "narHash": "sha256-CN6q6iCzxI1gkNyk4xLdwaMKi10r7n+aJkRzWj8PXwQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "65912bc6841cf420eb8c0a20e03df7cbbff5963f", + "rev": "6e5b2d9e8014b5572e3367937a329e7053458d34", "type": "github" }, "original": { @@ -409,6 +430,7 @@ "hyprcursor": "hyprcursor", "hyprgraphics": "hyprgraphics", "hyprland-protocols": "hyprland-protocols", + "hyprland-qtutils": "hyprland-qtutils", "hyprlang": "hyprlang", "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", @@ -418,11 +440,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1733369810, - "narHash": "sha256-veg37osP0Nmby/Bt7mdqD6k+Co3wO4jwnth0B2Z7vHU=", + "lastModified": 1734005819, + "narHash": "sha256-hbA0aFybdxjpu4Tr4xH57mOLjRMqcop6iBVA0ZFIIx4=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "ceef4fb3a5efe1617790f56e2701846a21c2533d", + "rev": "aefaeedf5e3f773c923373795267c1633141566c", "type": "github" }, "original": { @@ -456,6 +478,35 @@ "type": "github" } }, + "hyprland-qtutils": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1733472316, + "narHash": "sha256-PvXiFLIExJEJj+goLbIuXLTN5CSDSAUsAfiYSdbbWg0=", + "owner": "hyprwm", + "repo": "hyprland-qtutils", + "rev": "969427419276c7ee170301ef1ebe0f68eb6eb2e2", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-qtutils", + "type": "github" + } + }, "hyprlang": { "inputs": { "hyprutils": [ @@ -544,11 +595,11 @@ ] }, "locked": { - "lastModified": 1732739177, - "narHash": "sha256-iL32+TA/8geCzcL1r3uthrH/GPvbUak5QE++WJUkaiI=", + "lastModified": 1733859890, + "narHash": "sha256-HnA6z2l2W38TJBarvWCcxjTjcpz7JrDj2u2umjYFcEo=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "8d7b2149e618696d5100c2683af1ffa893f02a75", + "rev": "77ffd839fd9d60d139dc4a2ad6b6d526f4ad5a17", "type": "github" }, "original": { @@ -609,25 +660,6 @@ "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-1.tar.gz" } }, - "matugen": { - "inputs": { - "nixpkgs": "nixpkgs_3", - "systems": "systems_5" - }, - "locked": { - "lastModified": 1732961546, - "narHash": "sha256-r1DwfCYXHhE0zFb3CgRo0fxnmkIwVn1eRCIumYzS8vo=", - "owner": "InioX", - "repo": "matugen", - "rev": "3a5e27b2eb0593d2a3e86fd76aefb79e647086a2", - "type": "github" - }, - "original": { - "owner": "InioX", - "repo": "matugen", - "type": "github" - } - }, "nix-github-actions": { "inputs": { "nixpkgs": [ @@ -653,11 +685,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1733212471, - "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=", + "lastModified": 1733759999, + "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776", + "rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56", "type": "github" }, "original": { @@ -669,11 +701,11 @@ }, "nixpkgs-smol": { "locked": { - "lastModified": 1733380312, - "narHash": "sha256-ywntxT10Om755wkB9tYgJwEwELQZKYAO5WcNuHv1vjI=", + "lastModified": 1733925265, + "narHash": "sha256-SD/Gr1y7fhndRohoZy/edif3RM3+W84E4Vlzzejn0bI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a772498086eac57d97065a980a21fc0f304e3192", + "rev": "8cd84794deeea7d0d03c4bd3d0f6fdc32d806582", "type": "github" }, "original": { @@ -701,11 +733,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1732758367, - "narHash": "sha256-RzaI1RO0UXqLjydtz3GAXSTzHkpb/lLD1JD8a0W4Wpo=", + "lastModified": 1733392399, + "narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fa42b5a5f401aab8a32bd33c9a4de0738180dc59", + "rev": "d0797a04b81caeae77bcff10a9dde78bc17f5661", "type": "github" }, "original": { @@ -717,11 +749,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1724479785, - "narHash": "sha256-pP3Azj5d6M5nmG68Fu4JqZmdGt4S4vqI5f8te+E/FTw=", + "lastModified": 1733759999, + "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d0e1602ddde669d5beb01aec49d71a51937ed7be", + "rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56", "type": "github" }, "original": { @@ -733,11 +765,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1733212471, - "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=", + "lastModified": 1733759999, + "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776", + "rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56", "type": "github" }, "original": { @@ -780,12 +812,17 @@ } }, "nur": { + "inputs": { + "flake-parts": "flake-parts", + "nixpkgs": "nixpkgs_4", + "treefmt-nix": "treefmt-nix" + }, "locked": { - "lastModified": 1733396819, - "narHash": "sha256-AEBmhobRo6PcvaZn9oEfjsQ/NElKBIBj8Va7sivSyzw=", + "lastModified": 1734011512, + "narHash": "sha256-S0l5K/daUvuj94ZER+2YA5ixWuCbeyKBXuddV5Rqym8=", "owner": "nix-community", "repo": "NUR", - "rev": "e6098b0360b6436634f3604c134e99b608a8c252", + "rev": "4ae3bc562b6a45625f3e4c199624afb5b8891365", "type": "github" }, "original": { @@ -805,11 +842,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1732021966, - "narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=", + "lastModified": 1733318908, + "narHash": "sha256-SVQVsbafSM1dJ4fpgyBqLZ+Lft+jcQuMtEL3lQWx2Sk=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "3308484d1a443fc5bc92012435d79e80458fe43c", + "rev": "6f4e2a2112050951a314d2733a994fbab94864c6", "type": "github" }, "original": { @@ -828,8 +865,7 @@ "home-manager": "home-manager_2", "hyprland": "hyprland", "lix-module": "lix-module", - "matugen": "matugen", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "nixpkgs-smol": "nixpkgs-smol", "nur": "nur", "sops-nix": "sops-nix", @@ -866,11 +902,11 @@ ] }, "locked": { - "lastModified": 1733128155, - "narHash": "sha256-m6/qwJAJYcidGMEdLqjKzRIjapK4nUfMq7rDCTmZajc=", + "lastModified": 1733965552, + "narHash": "sha256-GZ4YtqkfyTjJFVCub5yAFWsHknG1nS/zfk7MuHht4Fs=", "owner": "Mic92", "repo": "sops-nix", - "rev": "c6134b6fff6bda95a1ac872a2a9d5f32e3c37856", + "rev": "2d73fc6ac4eba4b9a83d3cb8275096fbb7ab4004", "type": "github" }, "original": { @@ -887,11 +923,11 @@ ] }, "locked": { - "lastModified": 1733372233, - "narHash": "sha256-nEpd7QFcjHXop4Km9ldh1fXq0K10/u7kPlchPXl44/g=", + "lastModified": 1733977011, + "narHash": "sha256-o01UQJJwQWKXYGTrBy2TBmtTeCVUPmoGKVQv9JQcICk=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "8a832957847b643f758263293ccca6e801614a1c", + "rev": "b13d7de63ad41b10bab6e96ad7aacbfa83ab1d26", "type": "github" }, "original": { @@ -961,21 +997,6 @@ } }, "systems_5": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, - "systems_6": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -990,6 +1011,27 @@ "type": "github" } }, + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "nur", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733222881, + "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "49717b5af6f80172275d47a418c9719a31a78b53", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, "utils": { "inputs": { "systems": "systems_2" @@ -1020,11 +1062,11 @@ }, "locked": { "dir": "nix", - "lastModified": 1733323770, - "narHash": "sha256-UgxwyPAbnclzcWGltV1UKfoUihKJLv+o6aN0PWL0DUw=", + "lastModified": 1733412933, + "narHash": "sha256-2OPDEgUEh0B6OIcSWtBbkw/zFi8r2VfluLj7FebTaVA=", "owner": "wez", "repo": "wezterm", - "rev": "72e723187ca3596b67bcd3786457234ed40c75d2", + "rev": "6f375e29a2c4d70b8b51956edd494693196c6692", "type": "github" }, "original": { @@ -1062,11 +1104,11 @@ ] }, "locked": { - "lastModified": 1731703417, - "narHash": "sha256-rheDc/7C+yI+QspYr9J2z9kQ5P9F4ATapI7qyFAe1XA=", + "lastModified": 1733157064, + "narHash": "sha256-NetqJHAN4bbZDQADvpep+wXk2AbMZ2bN6tINz8Kpz6M=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "8070f36deec723de71e7557441acb17e478204d3", + "rev": "fd85ef39369f95eed67fdf3f025e86916edeea2f", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index cf8f0f2..1e578ff 100644 --- a/flake.nix +++ b/flake.nix @@ -8,7 +8,6 @@ "https://hyprland.cachix.org/" "https://anyrun.cachix.org" "https://wezterm.cachix.org" - "https://hydra.nixos.org/" ]; extra-trusted-public-keys = [ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" @@ -16,7 +15,6 @@ "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" "anyrun.cachix.org-1:pqBobmOjI7nKlsUMV25u9QHa9btJK65/C8vnO3p346s=" "wezterm.cachix.org-1:kAbhjYUC9qvblTE+s7S+kl5XM1zVa4skO+E/1IDWdH0=" - "hydra.nixos.org-1:CNHJZBh9K4tP3EKF6FkkgeVYsS3ohTl+oS0Qa8bezVs=" ]; auto-optimise-store = true; @@ -44,8 +42,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - matugen.url = "github:InioX/matugen"; - spicetify-nix = { url = "github:Gerg-L/spicetify-nix"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/hosts/epimetheus/configuration.nix b/hosts/epimetheus/configuration.nix index 839115a..a11010d 100644 --- a/hosts/epimetheus/configuration.nix +++ b/hosts/epimetheus/configuration.nix @@ -3,7 +3,7 @@ imports = [ "${modulesPath}/installer/cd-dvd/installation-cd-minimal.nix" ]; boot = { - kernelPackages = pkgs.linuxPackages_6_6; + kernelPackages = pkgs.linuxPackages_6_12; kernelParams = lib.mkAfter [ "noquiet" "toram" ]; enableContainers = false; }; @@ -11,13 +11,21 @@ nixpkgs.hostPlatform = "x86_64-linux"; environment.systemPackages = with pkgs; [ + # The essentials neovim disko parted git nixd pciutils - arch-install-scripts + + # The installers + arch-install-scripts # For arch and it's + xbps # Void linux + dnf5 # Fedora + debootstrap # Debin and ubuntu + apt # Ubuntu + ]; documentation = { diff --git a/hosts/nyx/configuration.nix b/hosts/nyx/configuration.nix index c9652b3..db7f4ac 100644 --- a/hosts/nyx/configuration.nix +++ b/hosts/nyx/configuration.nix @@ -82,19 +82,21 @@ hardware.pulseaudio.enable = false; security.rtkit.enable = true; - users.users.pingu = { - isNormalUser = true; - description = "Elissa"; - extraGroups = [ "networkmanager" "wheel" "input" "render" ]; - shell = pkgs.fish; - packages = with pkgs; [ - floorp - vesktop - equibop - element-desktop - alacritty - kitty - ]; + users.users = { + pingu = { + isNormalUser = true; + description = "Elissa"; + extraGroups = [ "networkmanager" "wheel" "input" "render" ]; + shell = pkgs.fish; + packages = with pkgs; [ + floorp + vesktop + equibop + element-desktop + alacritty + kitty + ]; + }; }; home-manager = { @@ -199,7 +201,6 @@ ]); environment.systemPackages = with pkgs; [ - inputs.matugen.packages."${pkgs.system}".default nautilus diff-so-fancy eog diff --git a/modules/nixos/games/default.nix b/modules/nixos/games/default.nix index 8a63270..a87b37a 100644 --- a/modules/nixos/games/default.nix +++ b/modules/nixos/games/default.nix @@ -1,7 +1,7 @@ { config, pkgs, inputs, ... }: { nixpkgs = { - overlays = [ inputs.nur.overlay ]; + overlays = [ inputs.nur.overlays.default ]; config = { allowUnfree = true; }; }; @@ -9,7 +9,7 @@ protonup-qt prismlauncher osu-lazer-bin - davinci-resolve + # davinci-resolve nur.repos.reedrw.jkps ]; diff --git a/modules/nixos/services/default.nix b/modules/nixos/services/default.nix index 11fbb3c..607f9df 100644 --- a/modules/nixos/services/default.nix +++ b/modules/nixos/services/default.nix @@ -3,7 +3,7 @@ imports = [ ./vpn.nix ./pipewire.nix - ./bluetooth.nix + # ./bluetooth.nix ./tailscale.nix ]; }