summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoradikro <adikro@disroot.org>2026-04-30 13:53:22 +0200
committeradikro <adikro@disroot.org>2026-04-30 13:53:22 +0200
commit427b01da7b5be8a27f67bae13e2808d946ed22d8 (patch)
tree778ae7db0da042d6c0f8487c9f0ff51f3f747de4
parent68f2b65dbbb97eef9a12f67f362c4adea03cc3b2 (diff)
sync
-rw-r--r--.sops.yaml2
-rw-r--r--flake.lock60
-rw-r--r--hm/shell/fish.nix16
-rw-r--r--hosts/desktop/configuration.nix11
-rw-r--r--secrets.yaml42
5 files changed, 59 insertions, 72 deletions
diff --git a/.sops.yaml b/.sops.yaml
index 7012728..41593d6 100644
--- a/.sops.yaml
+++ b/.sops.yaml
@@ -1,5 +1,5 @@
keys:
- - &admin_age age1l7tecyh25hydmqpmut00qtg59qmscxe7trcj4f8t5qyfqm04690qh44pc8
+ - &admin_age age1y8hkdaq5yry0gnlwjtvp6npu028zpgf648wcr2sr3s6q4dyxj96sv5a56j
- &host_szpont age1s39d4mdrjhkf8cy8eea02p836r7s875fj8f7w3z4ld2stmaac49qd075ww
- &host_thinkpad age12htxy05mlkaqx7q6m5wufkqnnvhmhe4nfsr5ljlwkdk0u59f7ujq7537fw
- &host_pendrive age1sx8ut0arwlrp7n7qvlaele8mq93pyvzc0ddetlk47cnyx935gcusdceq9q
diff --git a/flake.lock b/flake.lock
index 9a3cfac..1a1a75c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -383,11 +383,11 @@
]
},
"locked": {
- "lastModified": 1777258755,
- "narHash": "sha256-EC07KwADRE2LdIk7vEDyAaD3I0ZUq24T9jQF9L0iEPk=",
+ "lastModified": 1777476904,
+ "narHash": "sha256-EeLoE8n4+QCbteyAsYXxhfr97RFfWL1ga0xwfL6lpKw=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "7f8bbc93d63401e41368d6ddc46a4f631610fa90",
+ "rev": "8c8e5389e75a36bee53920de8ee24f017b3ae03e",
"type": "github"
},
"original": {
@@ -691,11 +691,11 @@
]
},
"locked": {
- "lastModified": 1777248294,
- "narHash": "sha256-QuwT4KoRh6y3CB5I6zxrcLNP7d/tDr7EonA3okTHZIA=",
+ "lastModified": 1777421059,
+ "narHash": "sha256-j+RatOnOaHNQ7NeTx9Y+mCxk4LdfW1i110CfzvldrZ8=",
"owner": "nix-community",
"repo": "neovim-nightly-overlay",
- "rev": "429e65b3d2978c6c5ca3a7c51c4ce4e3bafbcc20",
+ "rev": "b6c0276d965f099bfa2c81b063185b91420ed71e",
"type": "github"
},
"original": {
@@ -707,11 +707,11 @@
"neovim-src": {
"flake": false,
"locked": {
- "lastModified": 1777244573,
- "narHash": "sha256-iZ3pkuWVNGAcHgLTmGFWwa1IP87UErcOVd/0dd/N2Ms=",
+ "lastModified": 1777418282,
+ "narHash": "sha256-0Ob0no3cz2zs2RjO1B1tBWtm0p+uSSO0w11l73fgROU=",
"owner": "neovim",
"repo": "neovim",
- "rev": "f69aadd2b4e7e415500188e46f2db175c06f3406",
+ "rev": "c33e60f748ac4fbfcdc327ff85c18a6ff8258f88",
"type": "github"
},
"original": {
@@ -732,11 +732,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
},
"locked": {
- "lastModified": 1777240421,
- "narHash": "sha256-ooPmu+8tqOGh4kozPW4rJC7Y7WM/FHtEY3OK1PoNW7g=",
+ "lastModified": 1777472199,
+ "narHash": "sha256-gJr/OrHv6s8ANqv915sb69LLThow1u5yAO/ouElVGGM=",
"owner": "sodiboo",
"repo": "niri-flake",
- "rev": "2bb22af2985e5f3cfd051b3d977ebfbf81126280",
+ "rev": "323a80f2ce4541c595d491acbd15a8800201cbae",
"type": "github"
},
"original": {
@@ -765,11 +765,11 @@
"niri-unstable": {
"flake": false,
"locked": {
- "lastModified": 1777237919,
- "narHash": "sha256-bZHBzo4EuW/xLzXnnMKsIMdZYqgY2O0mIMdplwDHB8Y=",
+ "lastModified": 1777468255,
+ "narHash": "sha256-lBZc1UMy+1P1T/E41j3jQrpS7EFI3qegd+ktHZdamIg=",
"owner": "YaLTeR",
"repo": "niri",
- "rev": "a85b922919815c32a3ae34e0838830fe522d6a1c",
+ "rev": "dd1c3bcb9f1ef416df33ffa22d1d9bcee1398e7d",
"type": "github"
},
"original": {
@@ -786,11 +786,11 @@
]
},
"locked": {
- "lastModified": 1777126319,
- "narHash": "sha256-SFW0rs0iJ50dzpKURM+2R+ZKgZCJmVBq5c5yUBxn2Y4=",
+ "lastModified": 1777358134,
+ "narHash": "sha256-05PDthJs6UBkLjLN03qzO0EpjGnwkC/6f+T6I6GKdAY=",
"owner": "powerofthe69",
"repo": "nix-gaming-edge",
- "rev": "d797435300819f82931c50cd7e4ab5cbd6ada930",
+ "rev": "cc5d6ade3dea271bed0631888b6ca597991f06cd",
"type": "github"
},
"original": {
@@ -880,11 +880,11 @@
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1776877367,
- "narHash": "sha256-EHq1/OX139R1RvBzOJ0aMRT3xnWyqtHBRUBuO1gFzjI=",
+ "lastModified": 1777268161,
+ "narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "0726a0ecb6d4e08f6adced58726b95db924cef57",
+ "rev": "1c3fe55ad329cbcb28471bb30f05c9827f724c76",
"type": "github"
},
"original": {
@@ -944,11 +944,11 @@
"systems": "systems_3"
},
"locked": {
- "lastModified": 1777150561,
- "narHash": "sha256-YLVqyn6LpFa+h697TmZIk0qVIbe7MxMpL8UTF4K+efA=",
+ "lastModified": 1777478067,
+ "narHash": "sha256-2vZnUuv8fg2sIE6pXgGxZQQ3ZhQW1XE7Sxieg8gK2p4=",
"owner": "NotAShelf",
"repo": "nvf",
- "rev": "5b4f9c63205e5b0ef180a2b0e4cc844111f96fa6",
+ "rev": "13c4ad4b4bb926c22945e2fb8862769fe51f27f1",
"type": "github"
},
"original": {
@@ -1148,11 +1148,11 @@
"rust-overlay": "rust-overlay"
},
"locked": {
- "lastModified": 1776144554,
- "narHash": "sha256-ILLBoK1jB4C5y418nC1X34vCspjnx0DwU04+D5cL68U=",
+ "lastModified": 1777353605,
+ "narHash": "sha256-Pphmz7gGuPlDRuy7Lr2BSPV9rAH3aCJLYb0+1u8DKjM=",
"owner": "gabm",
"repo": "Satty",
- "rev": "f96a991f0bd623b64cefd3683bec514c39e1e37e",
+ "rev": "951e91287412f941bbe1a0f5dd0e4e0d43192cb3",
"type": "github"
},
"original": {
@@ -1191,11 +1191,11 @@
]
},
"locked": {
- "lastModified": 1776771786,
- "narHash": "sha256-DRFGPfFV6hbrfO9a1PH1FkCi7qR5FgjSqsQGGvk1rdI=",
+ "lastModified": 1777338324,
+ "narHash": "sha256-bc+ZZCmOTNq86/svGnw0tVpH7vJaLYvGLLKFYP08Q8E=",
"owner": "Mic92",
"repo": "sops-nix",
- "rev": "bef289e2248991f7afeb95965c82fbcd8ff72598",
+ "rev": "8eaee5c45428b28b8c47a83e4c09dccec5f279b5",
"type": "github"
},
"original": {
diff --git a/hm/shell/fish.nix b/hm/shell/fish.nix
index 1265fa8..908eb8f 100644
--- a/hm/shell/fish.nix
+++ b/hm/shell/fish.nix
@@ -59,22 +59,6 @@ in
name = "pisces";
src = pkgs.fishPlugins.pisces.src;
}
- # {
- # name = "fzf-fish";
- # src = pkgs.fishPlugins.fzf-fish.src;
- # }
- {
- name = "fish-you-should-use";
- src = pkgs.fishPlugins.fish-you-should-use.src;
- }
- {
- name = "colored-man-pages";
- src = pkgs.fishPlugins.colored-man-pages.src;
- }
- # {
- # name = "fifc";
- # src = pkgs.fishPlugins.fifc.src;
- # }
];
};
};
diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix
index 41cd69f..8ee67e5 100644
--- a/hosts/desktop/configuration.nix
+++ b/hosts/desktop/configuration.nix
@@ -3,7 +3,6 @@
username,
inputs,
pkgs,
- lib,
...
}:
{
@@ -110,9 +109,13 @@
thunar.enable = true;
};
- environment.systemPackages = [
- inputs.subtui.packages.x86_64-linux.subtui
- pkgs.gimp
+ environment.systemPackages = with pkgs; [
+ (inputs.subtui.packages.x86_64-linux.subtui)
+ stow
+ gimp
+ vis
+ lua-language-server
+ nil
];
boot = {
diff --git a/secrets.yaml b/secrets.yaml
index 55556f1..d06b199 100644
--- a/secrets.yaml
+++ b/secrets.yaml
@@ -13,41 +13,41 @@ syncthing:
yggdrasil-private-key: ENC[AES256_GCM,data:lyyOlWDvYa33Koc8DmhcRwgMI8KOsqmD9oc1gORb/RZiAXiKsmlXRFuiu3ba8CA1uAahJpK897ambZiFVi8qlgMrK7irfmqVyoF3r9luQJGyjrp9dvypSkRuQKLnp2Aj3FoIyXBM+mFwZpbAyGxTCTvylXhoqZo=,iv:2b4OwPNQt1WeF36oolSDIFwu3ux+f39/9+7brfgxqbg=,tag:rH8A5TYv+aG2sDKjJkZokw==,type:str]
sops:
age:
- - recipient: age1l7tecyh25hydmqpmut00qtg59qmscxe7trcj4f8t5qyfqm04690qh44pc8
+ - recipient: age1y8hkdaq5yry0gnlwjtvp6npu028zpgf648wcr2sr3s6q4dyxj96sv5a56j
enc: |
-----BEGIN AGE ENCRYPTED FILE-----
- YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBvUVViQmx1UVNONFlQQW1t
- a2FmUjJXM0pDOHJIanhGRzRQQUpjaEtpVURBCkhrbTh3aGh6K28vRisrdlQ5ZjF3
- S3c3aGNKVFlTYTE3TzhXMjdUU0czRUkKLS0tIEM4MVNPNFYyTXF6NWxjZFhaZEhm
- Y0lteEgzZVBYejBHeG8zeVFHM1RsSjAKOpQZ9fQbBlJOycnfV/36fjf3rXMpCGm+
- YQSsCdwR07Y7onWCAG3fsHDusbUZvl1284l5m+ukJptaCe8DMB5Hbg==
+ YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBVdGN2L2d0RFdUcEEvK1pp
+ eFhTUWhNTHB6S0hKOUhpVTIzT29TbVdmelVFCjhZL01ZK3NEdWZhOTRVTmNiaURn
+ M3F0WFBNYnYxb05YU0ZVRW9jNVR6cTAKLS0tIGRuZUIxeitmLzZBeGlxelMyVHBq
+ cjhrekxrN2IwOUZ5N25DdlM2LzBRWDQKSIbht68agXUCkBdo6GnBZ0hrNVlzA+6e
+ 3qd959nLvvWLT8mBxyt1TguNANoHF/TaCqXmTydhwFPgnVRRJQ4CQQ==
-----END AGE ENCRYPTED FILE-----
- recipient: age1s39d4mdrjhkf8cy8eea02p836r7s875fj8f7w3z4ld2stmaac49qd075ww
enc: |
-----BEGIN AGE ENCRYPTED FILE-----
- YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB0V1NhWnYxMFlVMWxMMkFj
- YXlJUmRnN0RNN25yeUd5NE9PMzBiTlA0RlQwCllKcWl4VnJVbTBGamc1dVg0L3RS
- ajFEbjVGcEpuRVBLRmY4dmp1YUR4WWcKLS0tIHI2UXE2Smc0em1XODNEY0x3dXd1
- WlhEM2VteStwaGM1aGlqdXdzaVAreHMKUOgEGQf72AXGVyGp1vSeYVKLC7X68hKC
- uZFW0JxGT964y7OAdGOC1SOl633a677yRBxMFYT1i9x1qklj+jgtNA==
+ YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBRVmpkZmlsYzBIYU9LQVdp
+ L3d5OUZ2ZEQwc3FMcmprSzY2TmlrTHRzdVhRCkwxNXdwQWpyK3phbktia3RNRGJJ
+ eG5jenRtbnpKejV6KzNiSE5LY2NoTDgKLS0tIGNnNjc4REc4WkJmT29pQno1bUFs
+ Z2dWTUdBbUJpUVQ1RzJ2THdZVDVsK3MKF1UQpm5FRmPkH/SyQDfvWpzZZEAyzCFI
+ qGZBeMTEfsRyxQvFI0yKWZKIHW0N2Gb1FnncoCW9hIo3NnBvBLVJpg==
-----END AGE ENCRYPTED FILE-----
- recipient: age12htxy05mlkaqx7q6m5wufkqnnvhmhe4nfsr5ljlwkdk0u59f7ujq7537fw
enc: |
-----BEGIN AGE ENCRYPTED FILE-----
- YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB5d3pRR1J3dEREamdGZWZK
- Snc1RE05dUdENW5iamJnSHZxdEJibHdubmxJCkVjNVRLNXNwSHIvTHpRN3BIbDVF
- QnEzWWJoQVUwNGhjNVNuZlAyZTR1VncKLS0tIHBKQ2pLd3dDdVltQkdXSUZVZFpS
- cDVQWHJEdnNDeWVSa2dycWxhUDZKbmsKv2vWjtc5gPa3+TMEX9iSwKhyquGbXiOx
- b6wOT+Op9bpoXv+bq2DzSRDgmTX2Vc2KlzTqCLBdfUGrcXdEjAKkJQ==
+ YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAyV25rZmpSOEREcDZ5T1gx
+ Uk9GM01jSnZqWjhyc0NsWnM4LzZabmE3TWtZCmxkS3llMEFlazZKKzVnd3VuQTFD
+ NFVtVTlsSVFtY3RnUkJDSnh2UVBSZVkKLS0tIE1GaWR3VTJVYnZpMU5YenZ4NHBN
+ VXU2MFlQTmM3TlpkTmlDYnZnb2o5eHMKD9rLtf3qD6d/2Dx1lI8NJXb+UKyu77OJ
+ gfLtInLTry/C7hftlLUKs4R5jwEW0f+O/7SBIRP3qKkqs1UYTlPkcQ==
-----END AGE ENCRYPTED FILE-----
- recipient: age1sx8ut0arwlrp7n7qvlaele8mq93pyvzc0ddetlk47cnyx935gcusdceq9q
enc: |
-----BEGIN AGE ENCRYPTED FILE-----
- YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBSNDNKTkFSdEZzeUN1T3J4
- MFB2VEh6allkQkxBNjA5RmJDdk5yb1lzOFFNCm5NM3FleVNORUVrYVZESno1QXA5
- d2hNbnBIendxMXU5TDVxZDM3VFFjYWcKLS0tIEZFVUdOQy95YjRZSlRpcng5WlVv
- UTRzNTFzeDlQWXVWVjBTV3ZnVllkVUEKe3BeeKOsEJmwKxUBb98Bek/evn4ylhlz
- uMTURAdoMWgnCo+l60NTcL2g01LK8m/HDjdk2Dmd/mjVuFpG9JuhXw==
+ YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB4c2VJSEQ5R09wOFlwMXBi
+ Tkw3dW0zak5rOUFJVVVHVzY3Yk53QVJIQ0hVCjgybU11RHAzajBPQVlJZDNlQisv
+ Qkx5YXF1SmE5Umlwd1oyMHVNL3BpOEUKLS0tIGlFaDFlTTFlQ3hCakFvaWNCZTlJ
+ SHVLdytlK0RzSWVURTM2NldLVlR0eXMKvOEQCjWrr6lKQBuiTkRHV4SsCukflnKg
+ CXZbLjjZ0Q5we+RTisnyT8pqVIJtD2oyCliBdpGoM+HuX6pc9YbwKg==
-----END AGE ENCRYPTED FILE-----
lastmodified: "2026-04-17T13:02:30Z"
mac: ENC[AES256_GCM,data:dVqS5hgPvhj5a4tcVZpbuSPcTr4thkdDN84rk45kI0HaXiSIxFy2l7WwlJb4ZkTdLhNFw1THgXMr4nHXW00ne8QzEt90ITKjHb6hXAFqCTcOPuzYDkwe9wPtJiu0FnTUiVqKSFlH/ZKoMlyU1vSvGrX0GqeNBMEtRuST39NNrfI=,iv:hotanmPBRJ8bByxs//Dbd7K03N6rDj7zPMgRb+1xk50=,tag:S/zE35gJKcUpQhXVjK4Mcw==,type:str]