diff --git a/.envrc b/.envrc new file mode 100644 index 0000000..3ecf576 --- /dev/null +++ b/.envrc @@ -0,0 +1 @@ +export SOPS_AGE_KEY=$(ssh-to-age -i ~/.ssh/id_ed25519 -private-key) diff --git a/.github/templates/PULL_REQUEST_TEMPLATE.md b/.github/templates/PULL_REQUEST_TEMPLATE.md deleted file mode 100644 index 6447273..0000000 --- a/.github/templates/PULL_REQUEST_TEMPLATE.md +++ /dev/null @@ -1,24 +0,0 @@ - - -## 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/.sops.yaml b/.sops.yaml index bdeec1a..83b1ca1 100644 --- a/.sops.yaml +++ b/.sops.yaml @@ -1,5 +1,7 @@ keys: - &primary age1amdd4hu6k0czf3mtlhd03yj3yzkdaynl7q5fdlqmjzpe9pwgxfjs3j0c85 + - &yggdrasil age1xxv54tzxz6n4cp4undmejl2lyd7k7s3yh9q0z6ed83evfuz6asqsqhaduv + - &loptland age13xshg5e6ucvnu3vqgn344mxpk5kcqutv2lf4gdffvwadq0ku5ewqy4cck6 creation_rules: - path_regex: secrets/secrets.yaml$ key_groups: @@ -10,8 +12,10 @@ creation_rules: key_groups: - age: - *primary + - *yggdrasil - path_regex: secrets/secrets-loptland.yaml$ key_groups: - age: - *primary + - *loptland diff --git a/flake.lock b/flake.lock index 4140c06..9d249af 100644 --- a/flake.lock +++ b/flake.lock @@ -39,11 +39,11 @@ ] }, "locked": { - "lastModified": 1730968822, - "narHash": "sha256-NocDjINsh6ismkhb0Xr6xPRksmhuB2WGf8ZmXMhxu7Y=", + "lastModified": 1731774881, + "narHash": "sha256-1Dxryiw8u2ejntxrrv3sMtIE8WHKxmlN4KeH+uMGbmc=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "a49bc3583ff223f426cb3526fdaa4bcaa247ec14", + "rev": "b31a6a4da8199ae3489057db7d36069a70749a56", "type": "github" }, "original": { @@ -75,11 +75,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1731220256, - "narHash": "sha256-7BWlJbGZ6rXtKOfgZYDQerygXco1YyYzXciuLN0UPP4=", + "lastModified": 1731738660, + "narHash": "sha256-tIXhc9lX1b030v812yVJanSR37OnpTb/OY5rU3TbShA=", "owner": "nix-community", "repo": "fenix", - "rev": "61c51d848301cefc1535856f9e68ad6e01a5c970", + "rev": "e10ba121773f754a30d31b6163919a3e404a434f", "type": "github" }, "original": { @@ -379,11 +379,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1730790589, - "narHash": "sha256-xJ6bQ4VmdTB7A+dMbmOMaZ8a6erB6rkZkB+yzqD7gd4=", + "lastModified": 1731479417, + "narHash": "sha256-NZ+Jc9XecxUIC6RBE5TdDo8hKzI704fMBKTz6lEH32w=", "owner": "helix-editor", "repo": "helix", - "rev": "b53dafe326d51b7f64a1c52379e3d4150cd2991e", + "rev": "6cca98264fe308bd6a4f7f85be2d821b58f60b4a", "type": "github" }, "original": { @@ -399,11 +399,11 @@ ] }, "locked": { - "lastModified": 1730837930, - "narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=", + "lastModified": 1731887066, + "narHash": "sha256-uw7K/RsYioJicV79Nl39yjtfhdfTDU2aRxnBgvFhkZ8=", "owner": "nix-community", "repo": "home-manager", - "rev": "2f607e07f3ac7e53541120536708e824acccfaa8", + "rev": "f3a2ff69586f3a54b461526e5702b1a2f81e740a", "type": "github" }, "original": { @@ -476,11 +476,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1731172465, - "narHash": "sha256-EboiVE3dYLvoMn4/E9bUjnWFu7ebN5Np6mE7m9ta1Qw=", + "lastModified": 1731941055, + "narHash": "sha256-ZuoVOgKcdfB8odNfNGN41CvaLiRxc52DO6jnbGfdUD8=", "ref": "refs/heads/main", - "rev": "a8ff3a452c1c445d24bdd9e7e4fcd66c8ef2a147", - "revCount": 5435, + "rev": "97493511f96af288e1f7b2bd3a119e47d75541fc", + "revCount": 5474, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -508,11 +508,11 @@ ] }, "locked": { - "lastModified": 1731169722, - "narHash": "sha256-hOljwsXpY4Y6guvcr51tWCnXo6c56yaBknnLXk1m3Vk=", + "lastModified": 1731941239, + "narHash": "sha256-+WF8+sbm4IBmq84FCJu31vv5yAJdEyXLPrDixFa9QIM=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "844eb98250da448e17471f20beed23a5f5d33a3a", + "rev": "95fee7d0a7fa48828f5e9da1af6dc1fd7adb360d", "type": "github" }, "original": { @@ -612,11 +612,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1731171284, - "narHash": "sha256-pwO3OCxIbLKm6NqpXeOGlO+CSOPQpcMCSJDXEctr7B8=", + "lastModified": 1731631555, + "narHash": "sha256-ehlfCIYAs0dETZadViau4dYprgP/P1RcwgcCV0EUFjo=", "owner": "hyprwm", "repo": "hyprlock", - "rev": "6c3c444136d6f87d3cd9610b12e45e4c2130ef3a", + "rev": "b9cf5151bad432fddb568702a943bab591c9387d", "type": "github" }, "original": { @@ -631,11 +631,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1731223637, - "narHash": "sha256-9FLqM8e6aGgFjFjrdfZnzNaYPRwuEkIvBCjJJa5huLo=", + "lastModified": 1731881415, + "narHash": "sha256-OeweFCPQ5QaJvZKARJJ9AsP7R3KDP+celSXzV2Jc5lQ=", "owner": "Jas-SinghFSU", "repo": "HyprPanel", - "rev": "4cadb3e6bf51c7e16d1c42915cb2a6661d923583", + "rev": "0555a84b302957695aa1f369e4f404835343b60a", "type": "github" }, "original": { @@ -656,11 +656,11 @@ ] }, "locked": { - "lastModified": 1731163338, - "narHash": "sha256-Qflei0JBeqQ0c8jxA8e982xAxJvfMwfx4Aci2eJi84s=", + "lastModified": 1731702627, + "narHash": "sha256-+JeO9gevnXannQxMfR5xzZtF4sYmSlWkX/BPmPx0mWk=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "60d3dece30f98e8ad85131829c8529950630d6bc", + "rev": "e911361a687753bbbdfe3b6a9eab755ecaf1d9e1", "type": "github" }, "original": { @@ -763,11 +763,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1730919458, - "narHash": "sha256-yMO0T0QJlmT/x4HEyvrCyigGrdYfIXX3e5gWqB64wLg=", + "lastModified": 1731797098, + "narHash": "sha256-UhWmEZhwJZmVZ1jfHZFzCg+ZLO9Tb/v3Y6LC0UNyeTo=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "e1cc1f6483393634aee94514186d21a4871e78d7", + "rev": "672ac2ac86f7dff2f6f3406405bddecf960e0db6", "type": "github" }, "original": { @@ -785,11 +785,11 @@ ] }, "locked": { - "lastModified": 1730453870, - "narHash": "sha256-d+kIgz4BvTXb7emjSFV3zjNydGmLUmuluQjdBb51R9o=", + "lastModified": 1731682434, + "narHash": "sha256-HnZFPB7akVIy0KuPq/tEkiB+Brt1qi0DUIDzR8z25qI=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "adb6bc4b661a43328752b4575be4968a4990c033", + "rev": "a6b9cf0b7805e2c50829020a73e7bde683fd36dd", "type": "github" }, "original": { @@ -800,11 +800,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1730785428, - "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", + "lastModified": 1731676054, + "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", + "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", "type": "github" }, "original": { @@ -816,17 +816,17 @@ }, "nixpkgs-latest-factorio": { "locked": { - "lastModified": 1730638571, - "narHash": "sha256-z9Wy1jmhFrABK3cEyiVmQtUwOuQW1YPwA8+HMnbEpnE=", + "lastModified": 1731242709, + "narHash": "sha256-zGhhtd4U3AxjA5dqzbHhD10q74Ychyu5mNGI7ic+Yng=", "owner": "Daholli", "repo": "nixpkgs", - "rev": "d941e9aa2d89f377d45516c5edd765fef15ea90a", + "rev": "2adc4d1f11c5abcf654ed50c2cbce897c6e78ccc", "type": "github" }, "original": { "owner": "Daholli", "repo": "nixpkgs", - "rev": "d941e9aa2d89f377d45516c5edd765fef15ea90a", + "rev": "2adc4d1f11c5abcf654ed50c2cbce897c6e78ccc", "type": "github" } }, @@ -844,11 +844,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1731233476, - "narHash": "sha256-I3Pk1PQWKAZaUBgAn3kp9HyaVkExeH45gSsn7MTz9JQ=", + "lastModified": 1731941026, + "narHash": "sha256-8QwYGgBcxNIIOXZlLLPAX2R6CLSQ+hVxmAM8eJkx3uU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b306e97ffe307c3bb34e1f9ccd61ad70ddce8991", + "rev": "d8ddabfaab0e82d3efb1e8266124f5deee06c4e9", "type": "github" }, "original": { @@ -874,29 +874,13 @@ "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": 1730785428, - "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", + "lastModified": 1731676054, + "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", + "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", "type": "github" }, "original": { @@ -940,11 +924,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1729880355, - "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=", + "lastModified": 1731676054, + "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "18536bf04cd71abd345f9579158841376fdd0c5a", + "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", "type": "github" }, "original": { @@ -972,11 +956,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1730785428, - "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", + "lastModified": 1731676054, + "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", + "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", "type": "github" }, "original": { @@ -988,11 +972,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1730272153, - "narHash": "sha256-B5WRZYsRlJgwVHIV6DvidFN7VX7Fg9uuwkRW9Ha8z+w=", + "lastModified": 1731763621, + "narHash": "sha256-ddcX4lQL0X05AYkrkV2LMFgGdRvgap7Ho8kgon3iWZk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2d2a9ddbe3f2c00747398f3dc9b05f7f2ebb0f53", + "rev": "c69a9bffbecde46b4b939465422ddc59493d3e4d", "type": "github" }, "original": { @@ -1004,11 +988,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1730200266, - "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=", + "lastModified": 1731319897, + "narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd", + "rev": "dc460ec76cbff0e66e269457d7b728432263166c", "type": "github" }, "original": { @@ -1029,11 +1013,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1730814269, - "narHash": "sha256-fWPHyhYE6xvMI1eGY3pwBTq85wcy1YXqdzTZF+06nOg=", + "lastModified": 1731363552, + "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "d70155fdc00df4628446352fc58adc640cd705c2", + "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", "type": "github" }, "original": { @@ -1070,11 +1054,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1731056261, - "narHash": "sha256-TPeXChHVcaCBAoE349K7OZH4We5/2ys1GgG4IiwjwOs=", + "lastModified": 1731693936, + "narHash": "sha256-uHUUS1WPyW6ohp5Bt3dAZczUlQ22vOn7YZF8vaPKIEw=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "dd9cd22514cb1001a0a2374b36a85eb75245f27b", + "rev": "1b90e979aeee8d1db7fe14603a00834052505497", "type": "github" }, "original": { @@ -1175,15 +1159,14 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_7", - "nixpkgs-stable": "nixpkgs-stable_2" + "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1731213149, - "narHash": "sha256-jR8i6nFLmSmm0cIoeRQ8Q4EBARa3oGaAtEER/OMMxus=", + "lastModified": 1731862312, + "narHash": "sha256-NVUTFxKrJp/hjehlF1IvkPnlRYg/O9HFVutbxOM8zNM=", "owner": "Mic92", "repo": "sops-nix", - "rev": "f1675e3b0e1e663a4af49be67ecbc9e749f85eb7", + "rev": "472741cf3fee089241ac9ea705bb2b9e0bfa2978", "type": "github" }, "original": { @@ -1325,11 +1308,11 @@ ] }, "locked": { - "lastModified": 1730743262, - "narHash": "sha256-iTLqj3lU8kFehPm5tXpctzkD274t/k1nwSSq3qCWXeg=", + "lastModified": 1731703417, + "narHash": "sha256-rheDc/7C+yI+QspYr9J2z9kQ5P9F4ATapI7qyFAe1XA=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "09b23cef06fe248e61cec8862c04b9bcb62f4b6d", + "rev": "8070f36deec723de71e7557441acb17e478204d3", "type": "github" }, "original": { @@ -1343,11 +1326,11 @@ "nixpkgs": "nixpkgs_8" }, "locked": { - "lastModified": 1731197724, - "narHash": "sha256-PvgM1OR95kJkCAIhLfTY+j/Tz9l4/1U+jTlTU8kwUtY=", + "lastModified": 1731689537, + "narHash": "sha256-0wN39XFD5bVcNANh9uLoQYyKbp9r6xX+oON1qI+L9iI=", "owner": "ch4og", "repo": "zen-browser-flake", - "rev": "f61a5370605af58398f316edfda63ca05996e6f1", + "rev": "064be844324965da1d596a541fdd831efe4a3a32", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 3f0ed80..29af6aa 100644 --- a/flake.nix +++ b/flake.nix @@ -7,7 +7,7 @@ nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs-master.url = "github:nixos/nixpkgs/master"; - nixpkgs-latest-factorio.url = "github:Daholli/nixpkgs/d941e9aa2d89f377d45516c5edd765fef15ea90a"; + nixpkgs-latest-factorio.url = "github:Daholli/nixpkgs/2adc4d1f11c5abcf654ed50c2cbce897c6e78ccc"; home-manager = { url = "github:nix-community/home-manager/master"; diff --git a/modules/home/tools/git/default.nix b/modules/home/tools/git/default.nix index f94dfa5..2b49b29 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 "6995A5FF33791B7B" "The pub key to sign commits with."; + signingKey = mkOpt types.str "ACCFA2DB47795D9E" "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 5610350..53960a4 100644 --- a/modules/nixos/apps/cli-apps/helix/default.nix +++ b/modules/nixos/apps/cli-apps/helix/default.nix @@ -31,6 +31,12 @@ 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; @@ -40,6 +46,9 @@ 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 b85bcdc..0142949 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; [ - discord + vesktop ]; }; } diff --git a/modules/nixos/desktop/addons/hypridle/default.nix b/modules/nixos/desktop/addons/hypridle/default.nix index fa4b26b..d0b4285 100644 --- a/modules/nixos/desktop/addons/hypridle/default.nix +++ b/modules/nixos/desktop/addons/hypridle/default.nix @@ -2,6 +2,7 @@ config, lib, namespace, + pkgs, ... }: let @@ -24,7 +25,7 @@ in general = { after_sleep_cmd = "hyprctl dispatch dpms on"; ignore_dbus_inhibit = false; - lock_cmd = "hyprlock"; + lock_cmd = "hyprlock-blur"; }; listener = [ diff --git a/modules/nixos/desktop/addons/hyprlock/default.nix b/modules/nixos/desktop/addons/hyprlock/default.nix index 050844c..f896207 100644 --- a/modules/nixos/desktop/addons/hyprlock/default.nix +++ b/modules/nixos/desktop/addons/hyprlock/default.nix @@ -31,9 +31,11 @@ in config = mkIf cfg.enable { security.pam.services.hyprlock = { }; + environment.systemPackages = [ hyprlock-blur ]; + ${namespace}.desktop.hyprland.settings = { bind = [ - "$mod CTRL, l, exec, ${hyprlock-blur}/bin/hyprlock-blur" + "$mod CTRL, l, exec, hyprlock-blur" ]; }; diff --git a/modules/nixos/desktop/hyprland/default.nix b/modules/nixos/desktop/hyprland/default.nix index b792963..92010ac 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] discord --disable-gpu-compositing" + "[workspace 8 silent] vesktop" "[workspace 9 silent] 1password" "[workspace 1 silent] zen" ]; diff --git a/modules/nixos/security/acme/default.nix b/modules/nixos/security/acme/default.nix index a574009..3a32ffa 100644 --- a/modules/nixos/security/acme/default.nix +++ b/modules/nixos/security/acme/default.nix @@ -26,15 +26,15 @@ in config = mkIf cfg.enable { sops = { secrets = { - netcup_customer_number = { + "netcup/customer_number" = { inherit (cfg) sopsFile; }; - netcup_api_key = { + "netcup/api/key" = { inherit (cfg) sopsFile; }; - netcup_api_password = { + "netcup/api/password" = { inherit (cfg) sopsFile; }; }; @@ -42,9 +42,9 @@ in templates = { "netcup.env" = { content = '' - NETCUP_CUSTOMER_NUMBER=${config.sops.placeholder.netcup_customer_number} - NETCUP_API_KEY=${config.sops.placeholder.netcup_api_key} - NETCUP_API_PASSWORD=${config.sops.placeholder.netcup_api_password} + NETCUP_CUSTOMER_NUMBER=${config.sops.placeholder."netcup/customer_number"} + NETCUP_API_KEY=${config.sops.placeholder."netcup/api/key"} + NETCUP_API_PASSWORD=${config.sops.placeholder."netcup/api/password"} NETCUP_PROPAGATION_TIMEOUT=1200 ''; }; diff --git a/modules/nixos/security/keyring/default.nix b/modules/nixos/security/keyring/default.nix index 4a75b59..bce8b04 100644 --- a/modules/nixos/security/keyring/default.nix +++ b/modules/nixos/security/keyring/default.nix @@ -18,5 +18,6 @@ in config = mkIf cfg.enable { services.gnome.gnome-keyring.enable = true; security.pam.services.sddm.enableGnomeKeyring = true; + security.pam.services.greetd.enableGnomeKeyring = true; }; } diff --git a/modules/nixos/security/sops/default.nix b/modules/nixos/security/sops/default.nix index d032d99..5362604 100644 --- a/modules/nixos/security/sops/default.nix +++ b/modules/nixos/security/sops/default.nix @@ -19,13 +19,15 @@ in environment.systemPackages = with pkgs; [ sops age + ssh-to-age ]; sops = { defaultSopsFile = lib.snowfall.fs.get-file "secrets/secrets.yaml"; defaultSopsFormat = "yaml"; - age.keyFile = "/home/cholli/.config/sops/age/keys.txt"; + # age.keyFile = "/home/cholli/.config/sops/age/keys.txt"; + age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ]; }; }; } diff --git a/modules/nixos/services/factorio-server/default.nix b/modules/nixos/services/factorio-server/default.nix index 5faf5d0..d57133f 100644 --- a/modules/nixos/services/factorio-server/default.nix +++ b/modules/nixos/services/factorio-server/default.nix @@ -24,15 +24,15 @@ in environment.systemPackages = [ pkgs.factorio-headless ]; sops = { secrets = { - factorio_token = { + "factorio/token" = { restartUnits = [ "factorio.service" ]; inherit (cfg) sopsFile; }; - factorio_username = { + "factorio/username" = { restartUnits = [ "factorio.service" ]; inherit (cfg) sopsFile; }; - factorio_game_password = { + "factorio/game_password" = { restartUnits = [ "factorio.service" ]; inherit (cfg) sopsFile; }; @@ -43,12 +43,12 @@ in "description": "Trying to run a factorio-headless-server on my nix system", "tags": ["vanilla"], "max_players": 10, - "game_password": "${config.sops.placeholder.factorio_game_password}", + "game_password": "${config.sops.placeholder."factorio/game_password"}", "allow_commands": "admins-only", "autosave_slots": 5, "ignore_player_limit_for_returning_players": true, - "username" : "${config.sops.placeholder.factorio_username}", - "token": "${config.sops.placeholder.factorio_token}" + "username" : "${config.sops.placeholder."factorio/username"}", + "token": "${config.sops.placeholder."factorio/token"}" } ''; templates."extraSettingsFile.json".mode = "0444"; diff --git a/modules/nixos/submodules/games/EVE_bottles.yml b/modules/nixos/submodules/games/EVE_bottles.yml new file mode 100644 index 0000000..26cf599 --- /dev/null +++ b/modules/nixos/submodules/games/EVE_bottles.yml @@ -0,0 +1,84 @@ +Arch: win64 +CompatData: '' +Creation_Date: '2024-11-12 18:24:45.924771' +Custom_Path: false +DLL_Overrides: {} +DXVK: dxvk-2.4.1 +Environment: Custom +Environment_Variables: {} +External_Programs: + b8ae3872-d1d4-435f-ba7f-1cd829b4da81: + executable: eve-online-latest+Setup.exe + folder: /home/cholli/Downloads + id: b8ae3872-d1d4-435f-ba7f-1cd829b4da81 + name: eve-online-latest+Setup + path: /home/cholli/Downloads/eve-online-latest+Setup.exe +Installed_Dependencies: +- dotnet40 +- dotnet48 +- vcredist2022 +Language: sys +LatencyFleX: latencyflex-v0.1.1 +NVAPI: dxvk-nvapi-v0.7.1 +Name: EVE +Parameters: + custom_dpi: 96 + decorated: true + discrete_gpu: false + dxvk: true + dxvk_nvapi: false + fixme_logs: false + fsr: false + fsr_quality_mode: none + fsr_sharpening_strength: 2 + fullscreen_capture: false + gamemode: false + gamescope: false + gamescope_borderless: false + gamescope_fps: 0 + gamescope_fps_no_focus: 0 + gamescope_fullscreen: true + gamescope_game_height: 0 + gamescope_game_width: 0 + gamescope_scaling: false + gamescope_window_height: 0 + gamescope_window_width: 0 + latencyflex: false + mangohud: false + mouse_warp: true + obsvkc: false + pulseaudio_latency: false + renderer: gl + sandbox: false + sync: wine + take_focus: false + use_be_runtime: true + use_eac_runtime: true + use_runtime: false + use_steam_runtime: false + versioning_automatic: false + versioning_compression: false + versioning_exclusion_patterns: false + virtual_desktop: false + virtual_desktop_res: 1280x720 + vkbasalt: false + vkd3d: true + vmtouch: false + vmtouch_cache_cwd: false +Path: EVE +Runner: caffe-9.7 +RunnerPath: '' +Sandbox: + share_net: false + share_sound: false +State: 0 +Uninstallers: {} +Update_Date: '2024-11-12 18:36:11.134986' +VKD3D: vkd3d-proton-2.13 +Versioning: false +Versioning_Exclusion_Patterns: [] +Windows: win10 +WorkingDir: /storage/home/bottles +data: {} +run_in_terminal: false +session_arguments: '' diff --git a/modules/nixos/tools/git/default.nix b/modules/nixos/tools/git/default.nix index 8b37b71..aea0314 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 "6995A5FF33791B7B" "The key ID to sign commits with."; + signingKey = mkOpt types.str "ACCFA2DB47795D9E" "The key ID to sign commits with."; }; config = mkIf cfg.enable { diff --git a/overlays/discord/default.nix b/overlays/discord/default.nix deleted file mode 100644 index 970b716..0000000 --- a/overlays/discord/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ ... }: - -final: prev: { - discord = prev.discord.overrideAttrs (oldAttrs: { - commandLineArgs = '' - --disable-gpu-compositing - ''; - }); -} diff --git a/secrets/secrets-loptland.yaml b/secrets/secrets-loptland.yaml index 76030da..6066f7f 100644 --- a/secrets/secrets-loptland.yaml +++ b/secrets/secrets-loptland.yaml @@ -1,13 +1,15 @@ -#ENC[AES256_GCM,data:Cgp+gOU81+rvdlY=,iv:8DxJxnCslDoEu0bxtlTjmNiAUCdiAV/8VYKTb4yqQ50=,tag:ZTkK7WCOBh1It6GuKPUXdg==,type:comment] -factorio_username: ENC[AES256_GCM,data:egV5kXtAiw==,iv:Hay0PC2yol5FAJGcWxLkxzNdwpD1V4UfDDnkhsjvjVQ=,tag:QBDS6eAeOswQoHBoi4Gj6A==,type:str] -factorio_token: ENC[AES256_GCM,data:whruEJQCNIqqfMA0A3yQdwwrzpIJBt815Lvex4Au,iv:hh3zZt+UxV9ltSHIAjpTRwtDvPgPU5APrB/1bXtKUkE=,tag:AgUmBYWp+Oyxm8O7yD8vlA==,type:str] -factorio_game_password: ENC[AES256_GCM,data:Gu/p0+Sbd6Y=,iv:6AB1T3JdleiUnusU7hw/0wOFNSBsAsBgP2yD9FB7zXk=,tag:DMgD4csthynuBon+KNZtOw==,type:str] -#ENC[AES256_GCM,data:15i2BBxM4iM=,iv:JV6Lsk8jUZl/eIJWkH/w5I2NraB9J9+0ggsENBGgbdI=,tag:HDwGheUv7dFIztQoJBjGmQ==,type:comment] -forgejo_db_password: ENC[AES256_GCM,data:CFsvko1AXRymDBC6WiOBs98rvFM=,iv:Wemhu8URxA6HsWQyYcPSwJzuMP4myrDC3rU3GEDVt7c=,tag:6wcNlDFVdnjez8hzi4E2cw==,type:str] -#ENC[AES256_GCM,data:nQnLBl7v,iv:HORr/Uvw4eUXfW5uS6rWr+6FkFF9bTNpMYGaRpVITRY=,tag:/r4n/xpqp7EPecGxDj4N+w==,type:comment] -netcup_customer_number: ENC[AES256_GCM,data:pRooJa3O,iv:0U/ONcWa2eqcsT1UpgXmLpAvJndaU8zln2g1HMbBQYE=,tag:+pu8EBl/dnm6DoLAtrjZBQ==,type:str] -netcup_api_key: ENC[AES256_GCM,data:nlkDz1VV2NIXxv/tIROWDHN9DLI0lVq9n9l2FlDwt+3H4G4gg6yCeZjGtR+pTCNfwio=,iv:x8HLL10ww52UJDkz7Yi02KBg7jbuLFHAlG0iMYDd8hk=,tag:pcuka4/Hu/QFIwS0b8GlxQ==,type:str] -netcup_api_password: ENC[AES256_GCM,data:k2mdQp57x5ZTypRCHbVlq1fembJ0uj5D0rb72K5rac43p888y3TFyiYVuDTosxR66mo=,iv:0OhtKWD/LWeV5ZWN9fbPozebSxvaFRdSn1AkX97ffAM=,tag:uY6A4jBL/9mtGy7++Yvn0A==,type:str] +factorio: + username: ENC[AES256_GCM,data:aFRsUMsoaw==,iv:8EGn99WbgJxUyEKuOcwV6U8awOl7bDfmui+M3mDBoCg=,tag:BzMvGS3lfTsXToI/I5dguQ==,type:str] + token: ENC[AES256_GCM,data:WP6FTOBOBuNF6+pzi090wXsXpL2XsU34dQ2ZMzmw,iv:uKM4hLyx3vdyk9F0SyKu4x+2sl442GWXwEKbdgo/Dug=,tag:Xw3BJ7wxuft6hOG9cGtW0g==,type:str] + game_password: ENC[AES256_GCM,data:GtLNoCdQH1M=,iv:dxOMtXscLeMdsQxWjNgrIMb08vL2wAswvd1oM6pEWPA=,tag:a55ciDtw9mjLM9x5YQBTwQ==,type:str] +forgejo: + db: + password: ENC[AES256_GCM,data:CicLsCG2WCtiKMcz3DF5eVVaT8A=,iv:SPO1H4AZwo5FjJWkf1OS7aPOrpTGxqsAj4q3cuuWAbA=,tag:0snK8RyAd8heNvui2sbSNw==,type:str] +netcup: + customer_number: ENC[AES256_GCM,data:9+QboNg1,iv:Tg9ylJUM8L/kzqFmk2uIsD9noqnp5wIxr5GVXMsZwB8=,tag:2qRggSIkPHuCQYDWCfka5Q==,type:str] + api: + key: ENC[AES256_GCM,data:eYTKtJSSXmZfkRjlj65OHi99mpD3Iom8dPc8v34pwJIQSBbxVaqdgb7Gqzhse1c9L+U=,iv:9gmsBwlJ+NQIGY5NBA6Fi/1EQium2pcfQkF7x/fHyFU=,tag:v25eeqT6/WEMG9za7LVWAg==,type:str] + password: ENC[AES256_GCM,data:VTW4XGDg19AbE4EM6kS0u89Sz6718vHXvZZmQlkhGJe/4/LQJHmF1FetAClxkLZ9Za0=,iv:sWHvjHEsMXBbtFmkEdAOeSlQ6VTabRJ28kH3iP3GDaY=,tag:5k6NXFXwXHorUGKe+sAbbg==,type:str] sops: kms: [] gcp_kms: [] @@ -17,14 +19,23 @@ sops: - recipient: age1amdd4hu6k0czf3mtlhd03yj3yzkdaynl7q5fdlqmjzpe9pwgxfjs3j0c85 enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA3NFlTd2hOTHBtUDhuT0lF - amtLclY2ZTN0SStZQjFSNkZUd1RmMkdJZ0dJCnB2WU04dk41Qk45aGphMW9GQVJ4 - b2VWQVlOVFFLaGJWaU9FVU5ZUWtlRncKLS0tIGVPYW5DQnJMeW1qdWtINDNlQWFo - NmhrdXhpbVlmUFNsT1VaQjZyYkZkdzgKhL2BKXfPWNWUbFavpmtBQpnNEm/x0xH6 - NsjiV05AcrqPmGjj2kjvTv4ULPSoHiHiC5McUMfFTYIrCJgNvUbmMg== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBleDhiRlplSndCcUhaMXV3 + ZUR5QXVyemQ2VlhaQ1JjampwaWV5emhnVGt3ClBWRlJJbmx4cldDWmI3cUd2M0Z5 + YTl5ODVTbmZjM2UxQkhGZ3hvRWVqWmMKLS0tIFlDZXJTQi9wTGxRWElvcDRPVStj + MGV3VDBEMWkxNkV4TGV6dTFWaDhLWXMKg2Xt5PJe7etU1yp+IgnwTnLl7AXaN1MA + 5RymeKYjdNipJtxSNxzTjkNpENtHyXLcjVEBTH3IjGujtyGPMpk3eg== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-11-07T14:40:34Z" - mac: ENC[AES256_GCM,data:uk2AeOA9pnhekuofIjXavCGy9ZaO0ObprkvnGhJg5lPr/hyT9l7YcZtMQ7wckKDLS03I1hCAcNg0w/EmSUeU2+EHLb6Z1IUj3l0HBUPtPIJwJZifkrzp9iQwGwlK+i6nfREEgPGeuNMj/rnD67MECO4NRHTzGBzH7ZImoDpu0Us=,iv:ss8Q7i75UOQDMJfw4dQCT0qxPUGwfHizX0c/TUej+vc=,tag:iufeO6sfaToNcJg6E8tuxA==,type:str] + - recipient: age13xshg5e6ucvnu3vqgn344mxpk5kcqutv2lf4gdffvwadq0ku5ewqy4cck6 + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSArRTBLR09YS0tuM212a25G + cWV5bnR5ZytjQWIvd2txSmdEWjExeWRSbTNvClQwMjc4VnhtdnpKQmQ3Z0JOTEFW + OEtEZ0h2bDlPb3UrNTZFVFdCajdzSGcKLS0tIG16UFNqRVpWOHJNTE03TkFTUDF1 + UllqSDR1YWl6aU1jSnY2WE9oczg5Q28KfN15tFxXHrJmOHySK+cyLi2bFqArg244 + bNTYyuBUtBW1Y/EuNpbyLjSNQpKZWFz7grE64uxrNQHP865N3wv0gg== + -----END AGE ENCRYPTED FILE----- + lastmodified: "2024-11-12T14:29:12Z" + mac: ENC[AES256_GCM,data:lKx1qAe689wkWkrMRvqHpE0zmv+ShLwpApBw2C4+JEuuHnoN1W7aoB/GQRkWzmImCCy9odzM2yoUa0mJogl0i+bddblrl+ZS0uPmPQrm3pM0sl876pelogxKuNpQWS8PRNDe24z3m06f0TozhfPF9D2ywH30tFH8naZONfWTTUU=,iv:tDhJVlWnTHnjZak32pgnUZ8XtM6TK9o2gZ0X3tcQD4Q=,tag:PcMS/5DpEkDkk+U0GG918w==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.9.1 diff --git a/systems/x86_64-linux/loptland/default.nix b/systems/x86_64-linux/loptland/default.nix index 6089006..d275c7b 100644 --- a/systems/x86_64-linux/loptland/default.nix +++ b/systems/x86_64-linux/loptland/default.nix @@ -23,7 +23,7 @@ in sops = { secrets = { - forgejo_db_password = { + "forgejo/db/password" = { inherit sopsFile; }; }; @@ -71,7 +71,7 @@ in database.type = "postgres"; lfs.enable = true; database = { - passwordFile = config.sops.secrets.forgejo_db_password.path; + passwordFile = config.sops.secrets."forgejo/db/password".path; }; settings = { @@ -111,8 +111,8 @@ in }; user.trustedPublicKeys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHFrDiO5+vMfD5MimkzN32iw3MnSMLZ0mHvOrHVVmLD0" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAII4Pr7p0jizrvIl0UhcvrmL5SHRQQQWIcHLAnRFyUZS6" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHFrDiO5+vMfD5MimkzN32iw3MnSMLZ0mHvOrHVVmLD0" # yggdrasil + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAII4Pr7p0jizrvIl0UhcvrmL5SHRQQQWIcHLAnRFyUZS6" # Phone ]; }; diff --git a/systems/x86_64-linux/yggdrasil/default.nix b/systems/x86_64-linux/yggdrasil/default.nix index 776dae4..444360d 100644 --- a/systems/x86_64-linux/yggdrasil/default.nix +++ b/systems/x86_64-linux/yggdrasil/default.nix @@ -15,6 +15,10 @@ in teams-for-linux obsidian zed-editor + + # eve + bottles + ]; environment.pathsToLink = [ "/libexec" ]; @@ -63,6 +67,9 @@ 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" ]; @@ -70,6 +77,7 @@ in windowrulev2 = [ "workspace 8 silent, class:^(steam)$, title:^(Friends List)" "workspace 8 silent, class:^(discord)$, title:^(Discord)" + "workspace 7 silent, class:^(com.obsproject.Studio)$" ]; }; };