diff --git a/.github/templates/PULL_REQUEST_TEMPLATE.md b/.github/templates/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 0000000..6447273 --- /dev/null +++ b/.github/templates/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,24 @@ + + +## Description + + +- Built on platform(s) + - [ ] x86_64-linux + - [ ] aarch64-linux + - [ ] x86_64-darwin + - [ ] aarch64-darwin + +## Types of changes + +- [ ] Bug fix (non-breaking change which fixes an issue) +- [ ] New feature (non-breaking change which adds functionality) +- [ ] Breaking change (fix or feature that would cause existing functionality to change) + +## Checklist: + + +- [ ] My change requires a change to the documentation. +- [ ] I have updated the documentation accordingly. +- [ ] I have added tests to cover my changes. +- [ ] All new and existing tests passed. diff --git a/flake.lock b/flake.lock index b7a0bf2..4140c06 100644 --- a/flake.lock +++ b/flake.lock @@ -39,11 +39,11 @@ ] }, "locked": { - "lastModified": 1731774881, - "narHash": "sha256-1Dxryiw8u2ejntxrrv3sMtIE8WHKxmlN4KeH+uMGbmc=", + "lastModified": 1730968822, + "narHash": "sha256-NocDjINsh6ismkhb0Xr6xPRksmhuB2WGf8ZmXMhxu7Y=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "b31a6a4da8199ae3489057db7d36069a70749a56", + "rev": "a49bc3583ff223f426cb3526fdaa4bcaa247ec14", "type": "github" }, "original": { @@ -75,11 +75,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1731738660, - "narHash": "sha256-tIXhc9lX1b030v812yVJanSR37OnpTb/OY5rU3TbShA=", + "lastModified": 1731220256, + "narHash": "sha256-7BWlJbGZ6rXtKOfgZYDQerygXco1YyYzXciuLN0UPP4=", "owner": "nix-community", "repo": "fenix", - "rev": "e10ba121773f754a30d31b6163919a3e404a434f", + "rev": "61c51d848301cefc1535856f9e68ad6e01a5c970", "type": "github" }, "original": { @@ -379,11 +379,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1731479417, - "narHash": "sha256-NZ+Jc9XecxUIC6RBE5TdDo8hKzI704fMBKTz6lEH32w=", + "lastModified": 1730790589, + "narHash": "sha256-xJ6bQ4VmdTB7A+dMbmOMaZ8a6erB6rkZkB+yzqD7gd4=", "owner": "helix-editor", "repo": "helix", - "rev": "6cca98264fe308bd6a4f7f85be2d821b58f60b4a", + "rev": "b53dafe326d51b7f64a1c52379e3d4150cd2991e", "type": "github" }, "original": { @@ -399,11 +399,11 @@ ] }, "locked": { - "lastModified": 1731887066, - "narHash": "sha256-uw7K/RsYioJicV79Nl39yjtfhdfTDU2aRxnBgvFhkZ8=", + "lastModified": 1730837930, + "narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=", "owner": "nix-community", "repo": "home-manager", - "rev": "f3a2ff69586f3a54b461526e5702b1a2f81e740a", + "rev": "2f607e07f3ac7e53541120536708e824acccfaa8", "type": "github" }, "original": { @@ -476,11 +476,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1731941055, - "narHash": "sha256-ZuoVOgKcdfB8odNfNGN41CvaLiRxc52DO6jnbGfdUD8=", + "lastModified": 1731172465, + "narHash": "sha256-EboiVE3dYLvoMn4/E9bUjnWFu7ebN5Np6mE7m9ta1Qw=", "ref": "refs/heads/main", - "rev": "97493511f96af288e1f7b2bd3a119e47d75541fc", - "revCount": 5474, + "rev": "a8ff3a452c1c445d24bdd9e7e4fcd66c8ef2a147", + "revCount": 5435, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -508,11 +508,11 @@ ] }, "locked": { - "lastModified": 1731941239, - "narHash": "sha256-+WF8+sbm4IBmq84FCJu31vv5yAJdEyXLPrDixFa9QIM=", + "lastModified": 1731169722, + "narHash": "sha256-hOljwsXpY4Y6guvcr51tWCnXo6c56yaBknnLXk1m3Vk=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "95fee7d0a7fa48828f5e9da1af6dc1fd7adb360d", + "rev": "844eb98250da448e17471f20beed23a5f5d33a3a", "type": "github" }, "original": { @@ -612,11 +612,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1731631555, - "narHash": "sha256-ehlfCIYAs0dETZadViau4dYprgP/P1RcwgcCV0EUFjo=", + "lastModified": 1731171284, + "narHash": "sha256-pwO3OCxIbLKm6NqpXeOGlO+CSOPQpcMCSJDXEctr7B8=", "owner": "hyprwm", "repo": "hyprlock", - "rev": "b9cf5151bad432fddb568702a943bab591c9387d", + "rev": "6c3c444136d6f87d3cd9610b12e45e4c2130ef3a", "type": "github" }, "original": { @@ -631,11 +631,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1731881415, - "narHash": "sha256-OeweFCPQ5QaJvZKARJJ9AsP7R3KDP+celSXzV2Jc5lQ=", + "lastModified": 1731223637, + "narHash": "sha256-9FLqM8e6aGgFjFjrdfZnzNaYPRwuEkIvBCjJJa5huLo=", "owner": "Jas-SinghFSU", "repo": "HyprPanel", - "rev": "0555a84b302957695aa1f369e4f404835343b60a", + "rev": "4cadb3e6bf51c7e16d1c42915cb2a6661d923583", "type": "github" }, "original": { @@ -656,11 +656,11 @@ ] }, "locked": { - "lastModified": 1731702627, - "narHash": "sha256-+JeO9gevnXannQxMfR5xzZtF4sYmSlWkX/BPmPx0mWk=", + "lastModified": 1731163338, + "narHash": "sha256-Qflei0JBeqQ0c8jxA8e982xAxJvfMwfx4Aci2eJi84s=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "e911361a687753bbbdfe3b6a9eab755ecaf1d9e1", + "rev": "60d3dece30f98e8ad85131829c8529950630d6bc", "type": "github" }, "original": { @@ -763,11 +763,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1731797098, - "narHash": "sha256-UhWmEZhwJZmVZ1jfHZFzCg+ZLO9Tb/v3Y6LC0UNyeTo=", + "lastModified": 1730919458, + "narHash": "sha256-yMO0T0QJlmT/x4HEyvrCyigGrdYfIXX3e5gWqB64wLg=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "672ac2ac86f7dff2f6f3406405bddecf960e0db6", + "rev": "e1cc1f6483393634aee94514186d21a4871e78d7", "type": "github" }, "original": { @@ -785,11 +785,11 @@ ] }, "locked": { - "lastModified": 1731682434, - "narHash": "sha256-HnZFPB7akVIy0KuPq/tEkiB+Brt1qi0DUIDzR8z25qI=", + "lastModified": 1730453870, + "narHash": "sha256-d+kIgz4BvTXb7emjSFV3zjNydGmLUmuluQjdBb51R9o=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "a6b9cf0b7805e2c50829020a73e7bde683fd36dd", + "rev": "adb6bc4b661a43328752b4575be4968a4990c033", "type": "github" }, "original": { @@ -800,11 +800,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1731676054, - "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", + "lastModified": 1730785428, + "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", + "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", "type": "github" }, "original": { @@ -844,11 +844,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1731941026, - "narHash": "sha256-8QwYGgBcxNIIOXZlLLPAX2R6CLSQ+hVxmAM8eJkx3uU=", + "lastModified": 1731233476, + "narHash": "sha256-I3Pk1PQWKAZaUBgAn3kp9HyaVkExeH45gSsn7MTz9JQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d8ddabfaab0e82d3efb1e8266124f5deee06c4e9", + "rev": "b306e97ffe307c3bb34e1f9ccd61ad70ddce8991", "type": "github" }, "original": { @@ -874,13 +874,29 @@ "type": "github" } }, + "nixpkgs-stable_2": { + "locked": { + "lastModified": 1730602179, + "narHash": "sha256-efgLzQAWSzJuCLiCaQUCDu4NudNlHdg2NzGLX5GYaEY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "3c2f1c4ca372622cb2f9de8016c9a0b1cbd0f37c", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "release-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-unstable": { "locked": { - "lastModified": 1731676054, - "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", + "lastModified": 1730785428, + "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", + "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", "type": "github" }, "original": { @@ -924,11 +940,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1731676054, - "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", + "lastModified": 1729880355, + "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", + "rev": "18536bf04cd71abd345f9579158841376fdd0c5a", "type": "github" }, "original": { @@ -956,11 +972,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1731676054, - "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", + "lastModified": 1730785428, + "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", + "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", "type": "github" }, "original": { @@ -972,11 +988,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1731763621, - "narHash": "sha256-ddcX4lQL0X05AYkrkV2LMFgGdRvgap7Ho8kgon3iWZk=", + "lastModified": 1730272153, + "narHash": "sha256-B5WRZYsRlJgwVHIV6DvidFN7VX7Fg9uuwkRW9Ha8z+w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c69a9bffbecde46b4b939465422ddc59493d3e4d", + "rev": "2d2a9ddbe3f2c00747398f3dc9b05f7f2ebb0f53", "type": "github" }, "original": { @@ -988,11 +1004,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1731319897, - "narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=", + "lastModified": 1730200266, + "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "dc460ec76cbff0e66e269457d7b728432263166c", + "rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd", "type": "github" }, "original": { @@ -1013,11 +1029,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1731363552, - "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", + "lastModified": 1730814269, + "narHash": "sha256-fWPHyhYE6xvMI1eGY3pwBTq85wcy1YXqdzTZF+06nOg=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", + "rev": "d70155fdc00df4628446352fc58adc640cd705c2", "type": "github" }, "original": { @@ -1054,11 +1070,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1731693936, - "narHash": "sha256-uHUUS1WPyW6ohp5Bt3dAZczUlQ22vOn7YZF8vaPKIEw=", + "lastModified": 1731056261, + "narHash": "sha256-TPeXChHVcaCBAoE349K7OZH4We5/2ys1GgG4IiwjwOs=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "1b90e979aeee8d1db7fe14603a00834052505497", + "rev": "dd9cd22514cb1001a0a2374b36a85eb75245f27b", "type": "github" }, "original": { @@ -1159,14 +1175,15 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_7", + "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1731862312, - "narHash": "sha256-NVUTFxKrJp/hjehlF1IvkPnlRYg/O9HFVutbxOM8zNM=", + "lastModified": 1731213149, + "narHash": "sha256-jR8i6nFLmSmm0cIoeRQ8Q4EBARa3oGaAtEER/OMMxus=", "owner": "Mic92", "repo": "sops-nix", - "rev": "472741cf3fee089241ac9ea705bb2b9e0bfa2978", + "rev": "f1675e3b0e1e663a4af49be67ecbc9e749f85eb7", "type": "github" }, "original": { @@ -1308,11 +1325,11 @@ ] }, "locked": { - "lastModified": 1731703417, - "narHash": "sha256-rheDc/7C+yI+QspYr9J2z9kQ5P9F4ATapI7qyFAe1XA=", + "lastModified": 1730743262, + "narHash": "sha256-iTLqj3lU8kFehPm5tXpctzkD274t/k1nwSSq3qCWXeg=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "8070f36deec723de71e7557441acb17e478204d3", + "rev": "09b23cef06fe248e61cec8862c04b9bcb62f4b6d", "type": "github" }, "original": { @@ -1326,11 +1343,11 @@ "nixpkgs": "nixpkgs_8" }, "locked": { - "lastModified": 1731689537, - "narHash": "sha256-0wN39XFD5bVcNANh9uLoQYyKbp9r6xX+oON1qI+L9iI=", + "lastModified": 1731197724, + "narHash": "sha256-PvgM1OR95kJkCAIhLfTY+j/Tz9l4/1U+jTlTU8kwUtY=", "owner": "ch4og", "repo": "zen-browser-flake", - "rev": "064be844324965da1d596a541fdd831efe4a3a32", + "rev": "f61a5370605af58398f316edfda63ca05996e6f1", "type": "github" }, "original": { diff --git a/modules/home/tools/git/default.nix b/modules/home/tools/git/default.nix index 2b49b29..f94dfa5 100644 --- a/modules/home/tools/git/default.nix +++ b/modules/home/tools/git/default.nix @@ -16,7 +16,7 @@ in enable = mkBoolOpt true "Enable Git (Default true)"; userName = mkOpt types.str user.fullName "The name to configure git with."; userEmail = mkOpt types.str user.email "The email to configure git with."; - signingKey = mkOpt types.str "ACCFA2DB47795D9E" "The pub key to sign commits with."; + signingKey = mkOpt types.str "6995A5FF33791B7B" "The pub key to sign commits with."; signByDefault = mkOpt types.bool true "Whether to sign commits by default."; }; diff --git a/modules/nixos/apps/cli-apps/helix/default.nix b/modules/nixos/apps/cli-apps/helix/default.nix index 53960a4..5610350 100644 --- a/modules/nixos/apps/cli-apps/helix/default.nix +++ b/modules/nixos/apps/cli-apps/helix/default.nix @@ -31,12 +31,6 @@ in ${namespace} = { home.extraOptions = { - home.file.".config/helix/ignore".text = '' - # unignore in file picker and global search - .idea/ - !**/appsettings.json - ''; - programs.helix = { enable = true; package = helix-pkg; @@ -46,9 +40,6 @@ in editor = { auto-format = true; line-number = "relative"; - file-picker = { - hidden = false; - }; lsp = { display-inlay-hints = true; diff --git a/modules/nixos/apps/discord/default.nix b/modules/nixos/apps/discord/default.nix index 0142949..b85bcdc 100644 --- a/modules/nixos/apps/discord/default.nix +++ b/modules/nixos/apps/discord/default.nix @@ -18,7 +18,7 @@ in config = mkIf cfg.enable { environment.systemPackages = with pkgs; [ - vesktop + discord ]; }; } diff --git a/modules/nixos/desktop/addons/hypridle/default.nix b/modules/nixos/desktop/addons/hypridle/default.nix index d0b4285..fa4b26b 100644 --- a/modules/nixos/desktop/addons/hypridle/default.nix +++ b/modules/nixos/desktop/addons/hypridle/default.nix @@ -2,7 +2,6 @@ config, lib, namespace, - pkgs, ... }: let @@ -25,7 +24,7 @@ in general = { after_sleep_cmd = "hyprctl dispatch dpms on"; ignore_dbus_inhibit = false; - lock_cmd = "hyprlock-blur"; + lock_cmd = "hyprlock"; }; listener = [ diff --git a/modules/nixos/desktop/addons/hyprlock/default.nix b/modules/nixos/desktop/addons/hyprlock/default.nix index f896207..050844c 100644 --- a/modules/nixos/desktop/addons/hyprlock/default.nix +++ b/modules/nixos/desktop/addons/hyprlock/default.nix @@ -31,11 +31,9 @@ in config = mkIf cfg.enable { security.pam.services.hyprlock = { }; - environment.systemPackages = [ hyprlock-blur ]; - ${namespace}.desktop.hyprland.settings = { bind = [ - "$mod CTRL, l, exec, hyprlock-blur" + "$mod CTRL, l, exec, ${hyprlock-blur}/bin/hyprlock-blur" ]; }; diff --git a/modules/nixos/desktop/hyprland/default.nix b/modules/nixos/desktop/hyprland/default.nix index 92010ac..b792963 100644 --- a/modules/nixos/desktop/hyprland/default.nix +++ b/modules/nixos/desktop/hyprland/default.nix @@ -125,7 +125,7 @@ in "systemctl --user start hyprpolkitagent" "[workspace 2 silent] steam --disable-gpu-compositing" # nvidia pls let me have nice things - "[workspace 8 silent] vesktop" + "[workspace 8 silent] discord --disable-gpu-compositing" "[workspace 9 silent] 1password" "[workspace 1 silent] zen" ]; diff --git a/modules/nixos/submodules/basics/default.nix b/modules/nixos/submodules/basics/default.nix index 164a613..bdc697b 100644 --- a/modules/nixos/submodules/basics/default.nix +++ b/modules/nixos/submodules/basics/default.nix @@ -33,14 +33,7 @@ in ]; ${namespace} = { - nix = { - enable = true; - extra-substituters = { - "https://nix-community.cachix.org" = { - key = "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="; - }; - }; - }; + nix = enabled; apps.cli-apps.helix = enabled; diff --git a/modules/nixos/tools/git/default.nix b/modules/nixos/tools/git/default.nix index aea0314..8b37b71 100644 --- a/modules/nixos/tools/git/default.nix +++ b/modules/nixos/tools/git/default.nix @@ -17,7 +17,7 @@ in enable = mkBoolOpt true "Wether or not to enable git (Default enabled)"; userName = mkOpt types.str user.fullName "The name to use git with"; userEmail = mkOpt types.str user.email "The email to use git with"; - signingKey = mkOpt types.str "ACCFA2DB47795D9E" "The key ID to sign commits with."; + signingKey = mkOpt types.str "6995A5FF33791B7B" "The key ID to sign commits with."; }; config = mkIf cfg.enable { diff --git a/overlays/discord/default.nix b/overlays/discord/default.nix new file mode 100644 index 0000000..970b716 --- /dev/null +++ b/overlays/discord/default.nix @@ -0,0 +1,9 @@ +{ ... }: + +final: prev: { + discord = prev.discord.overrideAttrs (oldAttrs: { + commandLineArgs = '' + --disable-gpu-compositing + ''; + }); +} diff --git a/systems/x86_64-linux/yggdrasil/default.nix b/systems/x86_64-linux/yggdrasil/default.nix index 7e7e090..c4ee49e 100644 --- a/systems/x86_64-linux/yggdrasil/default.nix +++ b/systems/x86_64-linux/yggdrasil/default.nix @@ -29,25 +29,6 @@ in AddressFamily inet ''; - nix = { - buildMachines = [ - { - hostName = "pi"; - sshUser = "remotebuild"; - sshKey = "/root/.ssh/remotebuild"; - systems = [ "aarch64-linux" ]; - protocol = "ssh-ng"; - - supportedFeatures = [ - "nixos-test" - "big-parallel" - ]; - } - ]; - - distributedBuilds = true; - - }; ${namespace} = { archetypes = { gaming.enable = true; @@ -86,17 +67,13 @@ in "2, monitor:DP-2" "3, monitor:DP-2" "4, monitor:DP-2" - "5, monitor:DP-2" - "6, monitor:DP-2" - "7, monitor:HDMI-A-1" "8, monitor:HDMI-A-1" "9, monitor:HDMI-A-1" ]; windowrulev2 = [ "workspace 8 silent, class:^(steam)$, title:^(Friends List)" - "workspace 8 silent, class:^(vesktop)$, title:^(Discord)" - "workspace 7 silent, class:^(com.obsproject.Studio)$" + "workspace 8 silent, class:^(discord)$, title:^(Discord)" ]; }; };