diff --git a/.sops.yaml b/.sops.yaml index 810c6cb..3cfb014 100644 --- a/.sops.yaml +++ b/.sops.yaml @@ -103,8 +103,3 @@ creation_rules: - age: - *chunk - *cy - - path_regex: secrets/services/tailscale.yaml - key_groups: - - age: - - *chunk - - *cy diff --git a/flake.lock b/flake.lock index bb0643e..c1dfbce 100644 --- a/flake.lock +++ b/flake.lock @@ -32,11 +32,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1737621947, - "narHash": "sha256-8HFvG7fvIFbgtaYAY2628Tb89fA55nPm2jSiNs0/Cws=", + "lastModified": 1733424942, + "narHash": "sha256-5t7Sl6EkOaoP4FvzLmH7HFDbdl9SizmLh53RjDQCbWQ=", "owner": "cachix", "repo": "cachix", - "rev": "f65a3cd5e339c223471e64c051434616e18cc4f5", + "rev": "8b6b0e4694b9aa78b2ea4c93bff6e1a222dc7e4a", "type": "github" }, "original": { @@ -120,11 +120,11 @@ "rocksdb": "rocksdb" }, "locked": { - "lastModified": 1737830431, - "narHash": "sha256-C/tkJeSefIAK9wke33HBvxCoBF/hqa+1+oPaLriOrNE=", + "lastModified": 1737153653, + "narHash": "sha256-yNdxoVZX13QUDJYM6zTMY9ExvacTqB+f0MLvDreSW8U=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "9514064c1c709dc7c437b1478b224bb0d711ec05", + "rev": "5b8464252c2c03edf65e43153be026dbb768a12a", "type": "github" }, "original": { @@ -157,11 +157,11 @@ }, "crane_2": { "locked": { - "lastModified": 1737689766, - "narHash": "sha256-ivVXYaYlShxYoKfSo5+y5930qMKKJ8CLcAoIBPQfJ6s=", + "lastModified": 1737250794, + "narHash": "sha256-bdIPhvsAKyYQzqAIeay4kOxTHGwLGkhM+IlBIsmMYFI=", "owner": "ipetkov", "repo": "crane", - "rev": "6fe74265bbb6d016d663b1091f015e2976c4a527", + "rev": "c5b7075f4a6d523fe8204618aa9754e56478c0e0", "type": "github" }, "original": { @@ -255,11 +255,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1737786656, - "narHash": "sha256-ubCW9Jy7ZUOF354bWxTgLDpVnTvIpNr6qR4H/j7I0oo=", + "lastModified": 1736836313, + "narHash": "sha256-zdZ7/T6yG0/hzoVOiNpDiR/sW3zR6oSMrfIFJK2BrrE=", "owner": "nix-community", "repo": "fenix", - "rev": "2f721f527886f801403f389a9cabafda8f1e3b7f", + "rev": "056c9393c821a4df356df6ce7f14c722dc8717ec", "type": "github" }, "original": { @@ -475,11 +475,11 @@ ] }, "locked": { - "lastModified": 1737465171, - "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", + "lastModified": 1737043064, + "narHash": "sha256-I/OuxGwXwRi5gnFPsyCvVR+IfFstA+QXEpHu1hvsgD8=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", + "rev": "94ee657f6032d913fe0ef49adaa743804635b0bb", "type": "github" }, "original": { @@ -562,11 +562,11 @@ ] }, "locked": { - "lastModified": 1737762889, - "narHash": "sha256-5HGG09bh/Yx0JA8wtBMAzt0HMCL1bYZ93x4IqzVExio=", + "lastModified": 1737480538, + "narHash": "sha256-rk/cmrvq3In0TegW9qaAxw+5YpJhRWt2p74/6JStrw0=", "owner": "nix-community", "repo": "home-manager", - "rev": "daf04c5950b676f47a794300657f1d3d14c1a120", + "rev": "4481a16d1ac5bff4a77c608cefe08c9b9efe840d", "type": "github" }, "original": { @@ -623,11 +623,11 @@ ] }, "locked": { - "lastModified": 1737639419, - "narHash": "sha256-AEEDktApTEZ5PZXNDkry2YV2k6t0dTgLPEmAZbnigXU=", + "lastModified": 1737299073, + "narHash": "sha256-hOydnO9trHDo3qURqLSDdmE/pHNWDzlhkmyZ/gcBX2s=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "a65905a09e2c43ff63be8c0e86a93712361f871e", + "rev": "64d20cb2afaad8b73f4e38de41d27fb30a782bb5", "type": "github" }, "original": { @@ -656,11 +656,11 @@ "liburing": { "flake": false, "locked": { - "lastModified": 1737600516, - "narHash": "sha256-EKyLQ3pbcjoU5jH5atge59F4fzuhTsb6yalUj6Ve2t8=", + "lastModified": 1736719310, + "narHash": "sha256-Turvx60THwzTiUHb49WV3upUgsPuktr7tVy2Lwu2xJg=", "owner": "axboe", "repo": "liburing", - "rev": "6c509e2b0c881a13b83b259a221bf15fc9b3f681", + "rev": "3124a4619e4daf26b06d48ccf0186a947070c415", "type": "github" }, "original": { @@ -683,11 +683,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1737810081, - "narHash": "sha256-WByslFoA16T/o5Fd+ebhSwmXtbL18L3ameJbzfepbI8=", + "lastModified": 1737468268, + "narHash": "sha256-RVR/Wh+iTTmw3IYe9b52Gho3If9iGc6Xxpw+gmJZ50s=", "ref": "refs/heads/main", - "rev": "0ad79775b6f9800eb00a2870f01eab338befcced", - "revCount": 16689, + "rev": "9b290081147fb2abf79d2d1e0afd72d1490145f2", + "revCount": 16659, "type": "git", "url": "https://git.lix.systems/lix-project/lix" }, @@ -710,11 +710,11 @@ ] }, "locked": { - "lastModified": 1737675503, - "narHash": "sha256-FUWpqPOsEJwK8oomffat+lgKnoxJHArRlWo2j17EhxQ=", + "lastModified": 1737241037, + "narHash": "sha256-6LIpS3rK1Ch6OXis4tvBTgGBTRb+NptDAfhPNzmgZSE=", "ref": "refs/heads/main", - "rev": "3e18a1ceec7df4514f5a045441e5f98dd003db09", - "revCount": 131, + "rev": "690f7c0fa2935bf591cccf4d7312b3e0f470298b", + "revCount": 129, "type": "git", "url": "https://git.lix.systems/lix-project/nixos-module" }, @@ -737,11 +737,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1737840481, - "narHash": "sha256-WjW3cdrmh1sGMT3CBqCFzT9BOktTa1u9ldoWEqTj7xk=", + "lastModified": 1737516423, + "narHash": "sha256-S3vmlekDRKgXsOreMMxLwJgvH313x1zU/wYtC8YThLg=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "8fc9dba8df75d9d004d9369b513b81180788ec15", + "rev": "8370d2475f0eac1b5dab31a107ee118d96692e31", "type": "github" }, "original": { @@ -770,11 +770,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1737795105, - "narHash": "sha256-zQSNUKj671I9M4DdMD4iMUnIIWN5oiaWdqDHUSVcaVE=", + "lastModified": 1737449786, + "narHash": "sha256-G/AK0T41PpxU9hjkK/tnjODigzKcpRayo1o4pi9glqI=", "owner": "YaLTeR", "repo": "niri", - "rev": "78697d1cea20e6b53013e820999b0403c45d9f00", + "rev": "b01b8afa8c8f9070300243050d9790e38fd19145", "type": "github" }, "original": { @@ -832,11 +832,11 @@ ] }, "locked": { - "lastModified": 1737504076, - "narHash": "sha256-/B4XJnzYU/6K1ZZOBIgsa3K4pqDJrnC2579c44c+4rI=", + "lastModified": 1736819234, + "narHash": "sha256-deQVtIH4UJueELJqluAICUtX7OosD9paTP+5FgbiSwI=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "65cc1fa8e36ceff067daf6cfb142331f02f524d3", + "rev": "bd921223ba7cdac346477d7ea5204d6f4736fcc6", "type": "github" }, "original": { @@ -1045,11 +1045,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1737795611, - "narHash": "sha256-0kGPO515JdDt6gPcR25QTGyNJnT1UFtH1tdkR2QdLAY=", + "lastModified": 1737469477, + "narHash": "sha256-GG0myEzULU7uiwoNGnwqiclki+Jg8dPG6nv7yKo7lMc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ed45d51fb4c860e70760a042dd9ff99bd016497e", + "rev": "2582766522e754520bf3f883f06560f89870a5ba", "type": "github" }, "original": { @@ -1082,11 +1082,11 @@ ] }, "locked": { - "lastModified": 1737832569, - "narHash": "sha256-VkK73VRVgvSQOPw9qx9HzvbulvUM9Ae4nNd3xNP+pkI=", + "lastModified": 1737484173, + "narHash": "sha256-bE9pTDqnSIMAwJeIu0MzA8ZR7LEwRbhnRpnImWIBejc=", "owner": "nix-community", "repo": "nixvim", - "rev": "d7df58321110d3b0e12a829bbd110db31ccd34b1", + "rev": "342161bf525dd64eb53fea295a2180f71ed06de1", "type": "github" }, "original": { @@ -1105,11 +1105,11 @@ ] }, "locked": { - "lastModified": 1737372689, - "narHash": "sha256-nH3zK2ki0fd5o5qvbGHxukE4qnOLJa1uCzoDObG5vrE=", + "lastModified": 1735854821, + "narHash": "sha256-Iv59gMDZajNfezTO0Fw6LHE7uKAShxbvMidmZREit7c=", "owner": "NuschtOS", "repo": "search", - "rev": "570cc17bbc25650eb7d69e4fcda8cfd2f1656922", + "rev": "836908e3bddd837ae0f13e215dd48767aee355f0", "type": "github" }, "original": { @@ -1180,11 +1180,11 @@ "rocksdb": { "flake": false, "locked": { - "lastModified": 1737828695, - "narHash": "sha256-8Ev6zzhNPU798JNvU27a7gj5X+6SDG3jBweUkQ59DbA=", + "lastModified": 1734469478, + "narHash": "sha256-IcQ4N8xADYal79K+ONmNq4RLlIwdgUqgrVzgNgiIaG8=", "owner": "girlbossceo", "repo": "rocksdb", - "rev": "a4d9230dcc9d03be428b9a728133f8f646c0065c", + "rev": "8b4808e7de2fbb5d119d8d72cdca76d8ab84bc47", "type": "github" }, "original": { @@ -1219,11 +1219,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1737728869, - "narHash": "sha256-U4pl3Hi0lT6GP4ecN3q9wdD2sdaKMbmD/5NJ1NdJ9AM=", + "lastModified": 1736690231, + "narHash": "sha256-g9gyxX+F6CrkT5gRIMKPnCPom0o9ZDzYnzzeNF86D6Q=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "6e4c29f7ce18cea7d3d31237a4661ab932eab636", + "rev": "8364ef299790cb6ec22b9e09e873c97dbe9f2cb5", "type": "github" }, "original": { @@ -1240,11 +1240,11 @@ ] }, "locked": { - "lastModified": 1737771740, - "narHash": "sha256-lWIdF4qke63TdCHnJ0QaUHfG8YvsDrBqzL4jiHYQd+Y=", + "lastModified": 1737512878, + "narHash": "sha256-dgF6htdmfNnZzVInifks6npnCAyVsIHWSpWNs10RSW0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "cfaaa1dddd280af09aca84af84612fbccd986ae2", + "rev": "06b8ed0eee289fe94c66f1202ced9a6a2c59a14c", "type": "github" }, "original": { @@ -1343,11 +1343,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1737837494, - "narHash": "sha256-wIMowP8Juas4ZwMRcpc+58sZ0kKTDu8fm13THPmv/F8=", + "lastModified": 1736487362, + "narHash": "sha256-4kGoOA7FgK9N2mzS+TFEn41kUUNY6KwdiA/0rqlr868=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "3944c9a0e40e5629f16ad023bbc90dac80d35a0f", + "rev": "8f55e27f63a749881c4bbfbb6b1da028342a91d1", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 95a0154..87eae13 100644 --- a/flake.nix +++ b/flake.nix @@ -89,7 +89,6 @@ "https://nix-community.cachix.org" "https://cache.garnix.io" "https://cything.cachix.org" - "https://aseipp-nix-cache.global.ssl.fastly.net" ]; extra-trusted-public-keys = [ "central:uWhjva6m6dhC2hqNisjn2hXGvdGBs19vPkA1dPEuwFg=" @@ -172,7 +171,7 @@ ./modules inputs.lanzaboote.nixosModules.lanzaboote inputs.niri.nixosModules.niri - inputs.lix-module.nixosModules.default # broken + inputs.lix-module.nixosModules.default ]; }; chunk = lib.nixosSystem { diff --git a/home/kitty.nix b/home/kitty.nix index f47567c..0586556 100644 --- a/home/kitty.nix +++ b/home/kitty.nix @@ -9,7 +9,7 @@ }; themeFile = "GitHub_Dark"; settings = { - enable_audio_bell = true; + enable_audio_bell = false; # how many windows should be open before kitty asks # for confirmation confirm_os_window_close = 0; @@ -20,7 +20,6 @@ "scrollback_pager_history_size" = "1024"; # see https://github.com/sharkdp/bat/issues/1077#issuecomment-652785399 "scrollback_pager" = "bat --pager='less -FR +G'"; - "scrollback_lines" = 20000; }; keybindings = { # kitty_mod is ctrl+shift by default diff --git a/home/niri/default.nix b/home/niri/default.nix index 0c72563..92f5701 100644 --- a/home/niri/default.nix +++ b/home/niri/default.nix @@ -135,16 +135,13 @@ in "Mod+Shift+U".action = move-window-to-workspace-up; "Mod+Shift+I".action = move-window-to-workspace-down; "Mod+W".action = maximize-column; - "Mod+E".action = set-column-width "50%"; - "Mod+R".action = set-column-width "75%"; - "Mod+Q".action = set-column-width "25%"; "Mod+C".action = center-column; "Mod+Shift+Space".action = toggle-window-floating; "Mod+Space".action = switch-focus-between-floating-and-tiling; "Print".action = screenshot; "Alt+Print".action = screenshot-window; "Ctrl+Print".action = screenshot-screen; - # "Mod+R".action = switch-preset-column-width; + "Mod+R".action = switch-preset-column-width; "Mod+Shift+R".action = switch-preset-window-height; "Mod+Ctrl+R".action = reset-window-height; "Mod+F".action = fullscreen-window; diff --git a/home/nixvim/default.nix b/home/nixvim/default.nix index 77586b6..8a302b0 100644 --- a/home/nixvim/default.nix +++ b/home/nixvim/default.nix @@ -115,8 +115,7 @@ end end) ''; - # plain tab conflicts with i try to indent - "" = '' + "" = '' cmp.mapping(function(fallback) if require("luasnip").jumpable(1) then require("luasnip").jump(1) @@ -175,7 +174,6 @@ }; plugins.fzf-lua = { enable = true; - profile = "fzf-native"; keymaps = { "ff" = "files"; "fg" = "live_grep"; diff --git a/home/yt/chunk.nix b/home/yt/chunk.nix index ad024cd..3285421 100644 --- a/home/yt/chunk.nix +++ b/home/yt/chunk.nix @@ -16,6 +16,7 @@ systemd.user.startServices = "sd-switch"; home.packages = with pkgs; [ + foot.terminfo attic-server ]; } diff --git a/home/yt/common.nix b/home/yt/common.nix index 4d7acca..77c98fe 100644 --- a/home/yt/common.nix +++ b/home/yt/common.nix @@ -44,11 +44,7 @@ rebase = true; autostash = true; }; - merge = { - tool = "vimdiff"; - keepBackup = false; - prompt = false; - }; + merge.tool = "vimdiff"; rebase = { stat = true; autoStash = true; @@ -56,7 +52,10 @@ updateRefs = true; }; help.autocorrect = 1; - "mergetool \"vimdiff\"".cmd = "nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'"; + mergetool = { + prompt = false; + path = "nvim-open"; + }; }; }; programs.ripgrep.enable = true; diff --git a/home/yt/ytnix.nix b/home/yt/ytnix.nix index e542d2b..b150993 100644 --- a/home/yt/ytnix.nix +++ b/home/yt/ytnix.nix @@ -49,6 +49,12 @@ x11.enable = true; }; + dconf.settings = { + "org/gnome/desktop/interface" = { + cursor-theme = "Bibata-Modern"; + }; + }; + home.packages = with pkgs; [ firefox ungoogled-chromium diff --git a/home/zsh/default.nix b/home/zsh/default.nix index 363efd6..994fa1f 100644 --- a/home/zsh/default.nix +++ b/home/zsh/default.nix @@ -94,8 +94,8 @@ "ga" = "git add"; "gaa" = "git add --all"; "gb" = "git branch"; - "gc" = "git commit --verbose -s"; - "gcmsg" = "git commit -s --message"; + "gc" = "git commit --verbose"; + "gcmsg" = "git commit --message"; "gd" = "git diff"; "gdca" = "git diff --cached"; "gds" = "git diff --staged"; diff --git a/hosts/chunk/default.nix b/hosts/chunk/default.nix index 0343084..edb153b 100644 --- a/hosts/chunk/default.nix +++ b/hosts/chunk/default.nix @@ -26,7 +26,6 @@ ./attic.nix ./forgejo.nix ./garage.nix - ./tailscale.nix ]; sops.age.keyFile = "/root/.config/sops/age/keys.txt"; @@ -67,12 +66,10 @@ "attic/env" = { sopsFile = ../../secrets/services/attic.yaml; }; + "garage/env" = { sopsFile = ../../secrets/services/garage.yaml; }; - "tailscale/auth" = { - sopsFile = ../../secrets/services/tailscale.yaml; - }; }; boot.loader.grub.enable = true; @@ -200,5 +197,4 @@ }; }; virtualisation.oci-containers.backend = "podman"; - environment.enableAllTerminfo = true; } diff --git a/hosts/chunk/forgejo.nix b/hosts/chunk/forgejo.nix index fd842ce..07d0e69 100644 --- a/hosts/chunk/forgejo.nix +++ b/hosts/chunk/forgejo.nix @@ -1,8 +1,7 @@ -{ pkgs, ... }: +{ ... }: { services.forgejo = { enable = true; - package = pkgs.forgejo; # uses forgejo-lts by default user = "git"; group = "git"; settings = { @@ -17,7 +16,7 @@ service.DISABLE_REGISTRATION = true; ui = { AMBIGUOUS_UNICODE_DETECTION = false; - DEFAULT_THEME = "forgejo-dark"; + DEFAULT_THEME = "gitea-dark"; }; actions.ENABLED = false; repository.ENABLE_PUSH_CREATE_USER = true; diff --git a/hosts/chunk/tailscale.nix b/hosts/chunk/tailscale.nix deleted file mode 100644 index fefc8e5..0000000 --- a/hosts/chunk/tailscale.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ config, ... }: { - services.tailscale = { - enable = true; - authKeyFile = config.sops.secrets."tailscale/auth".path; - extraUpFlags = [ - "--advertise-exit-node" - "--accept-dns=false" - ]; - useRoutingFeatures = "server"; - openFirewall = true; - }; -} diff --git a/hosts/common.nix b/hosts/common.nix index c4bc548..b334b5f 100644 --- a/hosts/common.nix +++ b/hosts/common.nix @@ -1,4 +1,4 @@ -{ inputs, ... }: +{ ... }: { nix = { settings = { @@ -9,21 +9,8 @@ "root" "@wheel" ]; - trusted-public-keys = [ - "central:uWhjva6m6dhC2hqNisjn2hXGvdGBs19vPkA1dPEuwFg=" - "niri.cachix.org-1:Wv0OmO7PsuocRKzfDoJ3mulSl7Z6oezYhGhR+3W2964=" - "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" - "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" - "cything.cachix.org-1:xqW1W5NNL+wrM9wfSELb0MLj/harD2ZyB4HbdaMyvPI=" - ]; - substituters = [ - "https://aseipp-nix-cache.global.ssl.fastly.net" - "https://cache.cything.io/central" - "https://niri.cachix.org" - "https://nix-community.cachix.org" - "https://cache.garnix.io" - "https://cything.cachix.org" - ]; + trusted-public-keys = [ "central:uWhjva6m6dhC2hqNisjn2hXGvdGBs19vPkA1dPEuwFg=" ]; + substituters = [ "https://cache.cything.io/central" ]; }; channel.enable = false; optimise = { @@ -37,9 +24,8 @@ options = "--delete-older-than 14d"; }; extraOptions = '' - builders-use-substitutes = true - ''; - registry.nixpkgs.flake = inputs.nixpkgs; + builders-use-substitutes = true + ''; }; time.timeZone = "America/Toronto"; networking.firewall.logRefusedConnections = false; diff --git a/hosts/ytnix/default.nix b/hosts/ytnix/default.nix index 54f13da..0024c40 100644 --- a/hosts/ytnix/default.nix +++ b/hosts/ytnix/default.nix @@ -9,7 +9,6 @@ ./hardware-configuration.nix ../common.nix ../zsh.nix - ./tailscale.nix ]; sops.age.keyFile = "/root/.config/sops/age/keys.txt"; @@ -33,9 +32,6 @@ sopsFile = ../../secrets/newsboat.yaml; owner = "yt"; }; - "tailscale/auth" = { - sopsFile = ../../secrets/services/tailscale.yaml; - }; }; boot = { @@ -62,7 +58,6 @@ pkiBundle = "/var/lib/sbctl"; }; kernel.sysctl."kernel.sysrq" = 1; - binfmt.emulatedSystems = [ "aarch64-linux" ]; }; networking = { @@ -133,7 +128,6 @@ "wheel" "libvirtd" "docker" - "disk" ]; environment.systemPackages = with pkgs; [ @@ -317,11 +311,8 @@ services.trezord.enable = true; - programs.niri.enable = true; - programs.niri.package = pkgs.niri-unstable; - programs.xwayland.enable = true; - - services.udev.extraHwdb = '' - SUBSYSTEM=="usb", SYSFS{idVendor}=="090c", SYSFS{idProduct}=="1000", ACTION=="add", GROUP="users", MODE="0664" - ''; + my.niri = { + enable = true; + package = pkgs.niri-unstable; + }; } diff --git a/hosts/ytnix/tailscale.nix b/hosts/ytnix/tailscale.nix deleted file mode 100644 index 91d67bf..0000000 --- a/hosts/ytnix/tailscale.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ config, ... }: { - services.tailscale = { - enable = true; - authKeyFile = config.sops.secrets."tailscale/auth".path; - openFirewall = true; - useRoutingFeatures = "client"; - extraUpFlags = [ - "--exit-node=100.122.132.30" - "--accept-dns=false" - ]; - }; -} diff --git a/justfile b/justfile deleted file mode 100644 index 95b1fda..0000000 --- a/justfile +++ /dev/null @@ -1,17 +0,0 @@ -update: - git switch -c update - nix flake update - git add flake.lock - git commit -s -m "flake update" - git push - git switch main - -upgrade: - git switch update - sudo nixos-rebuild switch -L --flake . --use-substitutes - nixos-rebuild switch -L --flake .#chunk --target-host root@2a0f:85c1:840:2bfb::1 --use-substitutes - nixos-rebuild switch -L --flake .#titan --target-host root@www.cything.io --use-substitutes - home-manager -L switch --flake . - git switch main - git merge update - git branch -d update diff --git a/modules/default.nix b/modules/default.nix index 2155137..bde6e96 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -2,5 +2,6 @@ { imports = [ ./backup.nix + ./niri.nix ]; } diff --git a/modules/niri.nix b/modules/niri.nix new file mode 100644 index 0000000..b5a6ef4 --- /dev/null +++ b/modules/niri.nix @@ -0,0 +1,21 @@ +{ + pkgs, + config, + lib, + ... +}: +let + cfg = config.my.niri; +in +{ + options.my.niri = { + enable = lib.mkEnableOption "niri"; + package = lib.mkPackageOption pkgs "niri" { }; + }; + + config = lib.mkIf cfg.enable { + programs.niri.package = cfg.package; + programs.niri.enable = true; + programs.xwayland.enable = true; + }; +} diff --git a/secrets/services/tailscale.yaml b/secrets/services/tailscale.yaml deleted file mode 100644 index 27997b8..0000000 --- a/secrets/services/tailscale.yaml +++ /dev/null @@ -1,31 +0,0 @@ -tailscale: - auth: ENC[AES256_GCM,data:7gGiUBRUK25Tp5y/5DDZKOTxKPFFfN1UUeBOdMLLQqobq643MKdJ9imxkKmKFg/FwgLYft/uzdxQGGlE7Q==,iv:HRmd+T1QuTYP8VrX/bZt8dWSwm5rcUvpEMqCMPfxjE4=,tag:PRZn2Pm6yydfEULrYGM6yg==,type:str] -sops: - kms: [] - gcp_kms: [] - azure_kv: [] - hc_vault: [] - age: - - recipient: age1eg6sxflw6l44fp20sl068sampwd95fm0mnh4ssegrhtktgm50ptqcuspyn - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA2Z1JZZmZMaDQ3UHYvbXYr - c05RaEMxUGJXSGczUDBkL1UxT0hjQ0VNNkJNClFUNmJ5d3gyaHFwMTdNVW9GQ2ly - V3haMkx5Z1B5dmJ0SE4wY0UzMWswQ0EKLS0tIGNpZVo3UmtHcjFZVE5FMmdpOGMx - UFZGb3I1L3FJYVE2VjJ5aTVoZlo4bFUKwH2sPBwuLQXrHmiKYSu4Eut/H2j/2tUW - 1y8Eph7l6w3kfhZRRbo6cZ8gcbZNHPSPeAvWf/TpYumiTt1WBt8SMw== - -----END AGE ENCRYPTED FILE----- - - recipient: age10h6pg5qdpc4t0rpmksfv788a57f04n83zgqaezkjjn65nkhv547s0vxfdn - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBSVXBMTEMrY1NGa1NBSjZP - R04wYUsrdGlVa3FnL1NYVG4xdUdqeHNnM0ZJCmhMSzFoRVFSOFBrQlU3VUtwaU0r - TEtad1B5NGh3OW1oajNvckhJcExrU0kKLS0tIFc5K3JOVTUvSFU1dmQxMUFRZ1o3 - em5IemlsM29zVy9GK3RmTlgzVnRpMDAKRatmFgCdoXcypQ+1EDedCuVctl0SFMf4 - kjtHrTSpept/y9bpTUy656aPRQ1LvqvfPs7Co1ssC/YWFroDsLgv4w== - -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-01-24T05:26:20Z" - mac: ENC[AES256_GCM,data:GbQrLESUR/x+eLzukOR1FaJsd8zxlrz9dc/2kDBKUYAgI8L4QwLmwRuzpaIJgNLv2PdLTW83oSC8ekxR8fmsap40DpiygcrmPdPUeVFbEPaz7SSvU+DCgB0UX+qNQ9aOQ0BIbeKKOIj3r9enGv2o6DKY8I85n7VXjnGZAmCf1C8=,iv:UrtVqRGwvOpXOH3X3qF6ZF+VwqO0VGt+hFG7r6oUqCg=,tag:TD4mG3t5ORYgAS0GBmA7Eg==,type:str] - pgp: [] - unencrypted_suffix: _unencrypted - version: 3.9.3