diff options
| -rw-r--r-- | .sops.yaml | 2 | ||||
| -rw-r--r-- | flake.lock | 60 | ||||
| -rw-r--r-- | hm/editors/nixvim.nix | 27 | ||||
| -rw-r--r-- | hm/shell/cli.nix | 1 | ||||
| -rw-r--r-- | hm/shell/fish.nix | 7 | ||||
| -rw-r--r-- | hosts/pendrive/configuration.nix | 8 | ||||
| -rw-r--r-- | os/srv/sops.nix | 2 | ||||
| -rw-r--r-- | secrets.yaml | 49 |
8 files changed, 90 insertions, 66 deletions
@@ -1,11 +1,13 @@ keys: - &admin_gpg EF69F2FB25C8B5A66918EA91A38ACEAB9656CD94 - &host_szpont age1s39d4mdrjhkf8cy8eea02p836r7s875fj8f7w3z4ld2stmaac49qd075ww + - &host_pendrive age1sx8ut0arwlrp7n7qvlaele8mq93pyvzc0ddetlk47cnyx935gcusdceq9q creation_rules: - path_regex: secrets.yaml$ key_groups: - age: - *host_szpont + - *host_pendrive pgp: - *admin_gpg @@ -136,11 +136,11 @@ ] }, "locked": { - "lastModified": 1770491427, - "narHash": "sha256-8b+0vixdqGnIIcgsPhjdX7EGPdzcVQqYxF+ujjex654=", + "lastModified": 1770642890, + "narHash": "sha256-XWWHZEy5ZYMOx5hVuz+oeKtKDfv7syl7dwKCBx0LqzA=", "owner": "nix-community", "repo": "home-manager", - "rev": "cbd8a72e5fe6af19d40e2741dc440d9227836860", + "rev": "13a1beb7c9962e0d2ba35a4d5c87546509b89b7d", "type": "github" }, "original": { @@ -175,11 +175,11 @@ ] }, "locked": { - "lastModified": 1770509107, - "narHash": "sha256-YsfKRbd5fbcb2VTxywzAGpc4txXApMXfG0vtxEldt7Q=", + "lastModified": 1770595508, + "narHash": "sha256-d81J55C/ctzfofd10e4k8Bldm1eXKuVaQAewbZPjHN4=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "0bb52596f3ea543781d2c20b1c2ee495a174a7d5", + "rev": "58b19445f29efe3b94db874fc64407099de0f0f7", "type": "github" }, "original": { @@ -191,11 +191,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1770505476, - "narHash": "sha256-HvlTxVEso/hl9lwweHerBRLtI/q05SQTxDr2l0Njfig=", + "lastModified": 1770587030, + "narHash": "sha256-2CaAx32akEOjUwkKnkvMWsHLhMvoIZ/SsV4ByiEIxfg=", "owner": "neovim", "repo": "neovim", - "rev": "ed8fbd2e2992cb264cb62585098a1c7acc5c4585", + "rev": "19379d1255554041eb6d67423cfa83ca23e5be42", "type": "github" }, "original": { @@ -216,11 +216,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1770493836, - "narHash": "sha256-UPG9xFnVkqHF5e2GOucQO8BXXzwp8BwwON2g+WBXLMA=", + "lastModified": 1770620836, + "narHash": "sha256-HPoMvo/EqIr6xDDRlk6DGZYdu1Hte7lGLZaGZ5017Uc=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "a17befde0c0ca25617fb3da505294deb45cef170", + "rev": "ff1edce403a67cfac7bf1038d348f2ef457ac691", "type": "github" }, "original": { @@ -249,11 +249,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1770394936, - "narHash": "sha256-Pa0fkyLYUR+pZh7phPENDUo4mJIweaAm0uV83iUUlX8=", + "lastModified": 1770394959, + "narHash": "sha256-if7bIsomdceIufOhkFwN74rFY/pLCWPynRxGyol2viQ=", "owner": "YaLTeR", "repo": "niri", - "rev": "549148d27779d024255a84535b42b947f1c2a113", + "rev": "ab47f5cec4c1c5758afeb91c0c98554ffd3433db", "type": "github" }, "original": { @@ -286,11 +286,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1770197578, - "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=", + "lastModified": 1770562336, + "narHash": "sha256-ub1gpAONMFsT/GU2hV6ZWJjur8rJ6kKxdm9IlCT0j84=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2", + "rev": "d6c71932130818840fc8fe9509cf50be8c64634f", "type": "github" }, "original": { @@ -356,11 +356,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1770388595, - "narHash": "sha256-0NvpmDqFcJAtRFJE3RDZWnN7PDJBZutoDtN+Cl8a3DY=", + "lastModified": 1770630823, + "narHash": "sha256-5SEmOnJ61vmbap39vzWEsCX5UQ+3Ul8J4mXWKdqSn3w=", "owner": "nix-community", "repo": "nixvim", - "rev": "51abc532525e486176f9a7b24b17908c60017b54", + "rev": "6acc964664ac916c64fe4e394edd467af4d90790", "type": "github" }, "original": { @@ -540,11 +540,11 @@ ] }, "locked": { - "lastModified": 1770495628, - "narHash": "sha256-hcPR/40oTUulZHxxyarOzPz7izbMu8IbEQ3/2dGaBQQ=", + "lastModified": 1770581246, + "narHash": "sha256-ywcaEOxk8trJNES7gKx6bWXgACp1iz7FY1Pnsdmt1fE=", "owner": "Alexays", "repo": "Waybar", - "rev": "2616785d187656646571f390978440ee2e13eb17", + "rev": "306f9706844d2e25c89b1338d12983600f416447", "type": "github" }, "original": { @@ -573,11 +573,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1770167989, - "narHash": "sha256-rE2WTxKHe3KMG/Zr5YUNeKHkZfWwSFl7yJXrOKnunHg=", + "lastModified": 1770583271, + "narHash": "sha256-Q75S8cEqJoZ92s1y4zArvk2U1ayAy2E4SaF7gbNXkYQ=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "0947c4685f6237d4f8045482ce0c62feab40b6c4", + "rev": "86f5bd5d867ad6e120935dfe825f6b903ebbeddd", "type": "github" }, "original": { @@ -595,11 +595,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1770518798, - "narHash": "sha256-5TnWJRYeXzgeG2jFsg+gee+jKLeHaPzQBhczgj9cPs8=", + "lastModified": 1770598201, + "narHash": "sha256-7E8l+muffPFzlKzRR7YYFlVEjgfgV/d7EfMfeDuXeh0=", "owner": "sxyazi", "repo": "yazi", - "rev": "0aeeb3b0f76ac2748cb6a40c01689b5c2f74a932", + "rev": "1a121bbfb0fa024741c07535d23303415f459944", "type": "github" }, "original": { diff --git a/hm/editors/nixvim.nix b/hm/editors/nixvim.nix index 9db6bff..579c9e2 100644 --- a/hm/editors/nixvim.nix +++ b/hm/editors/nixvim.nix @@ -213,18 +213,18 @@ in "show_documentation" "hide" ]; - "<CR>" = [ - "accept" - "fallback" - ]; - "<Tab>" = [ - "select_next" - "fallback" - ]; - "<S-Tab>" = [ - "select_prev" - "fallback" - ]; + # "<CR>" = [ + # "accept" + # "fallback" + # ]; + # "<Tab>" = [ + # "select_next" + # "fallback" + # ]; + # "<S-Tab>" = [ + # "select_prev" + # "fallback" + # ]; }; }; }; @@ -260,8 +260,7 @@ in lsp = { enable = true; servers = { - zls.enable = true; - zls.package = pkgs.zls; + # zls.enable = true; nil_ls.enable = true; clangd.enable = true; }; diff --git a/hm/shell/cli.nix b/hm/shell/cli.nix index 2716e00..da9c64e 100644 --- a/hm/shell/cli.nix +++ b/hm/shell/cli.nix @@ -75,6 +75,7 @@ in }; programs.tealdeer = { enable = true; + enableAutoUpdates = true; }; # programs.lazygit = { # enable = true; diff --git a/hm/shell/fish.nix b/hm/shell/fish.nix index 6338cb1..a417274 100644 --- a/hm/shell/fish.nix +++ b/hm/shell/fish.nix @@ -21,6 +21,8 @@ in shellAliases = { update = "git add . && git commit -m \"$1\" && nix flake update && nh os switch ."; + ns = "nix-search -p"; + nd = "nix develop ."; nos = "nh os switch ."; nob = "nh os boot ."; nfu = "nix flake update"; @@ -30,6 +32,11 @@ in untar = "tar -xzvf"; tarc = "tar -czvf"; + du = "dust -b"; + awk = "choose"; + dig = "doggo"; + ping = "gping"; + ps = "procs"; ff = "fastfetch"; cat = "bat"; yt = "yt-dlp"; diff --git a/hosts/pendrive/configuration.nix b/hosts/pendrive/configuration.nix index 37ab16e..9651ab6 100644 --- a/hosts/pendrive/configuration.nix +++ b/hosts/pendrive/configuration.nix @@ -15,9 +15,13 @@ allowUnfree.enable = true; audio.enable = true; - bootloader = "systemd-boot"; + bootloader.type = "systemd-boot"; drivers = { enable = true; + cpu = "intel"; + graphics = { + enable = true; + }; kernel = "hardened"; }; fonts.enable = true; @@ -38,11 +42,13 @@ users.enable = true; }; srv = { + sops.enable = true; files = { thunar.enable = true; utils.enable = true; }; nix-helper.enable = true; + monero.enable = true; }; wm = { enable = true; diff --git a/os/srv/sops.nix b/os/srv/sops.nix index b11dee0..0d0c7bf 100644 --- a/os/srv/sops.nix +++ b/os/srv/sops.nix @@ -17,7 +17,7 @@ in secrets = { "syncthing/gui_password" = { - owner = config.services.syncthing.user; + owner = username; }; "obs/websocket_password" = { owner = username; diff --git a/secrets.yaml b/secrets.yaml index 64cba76..913a731 100644 --- a/secrets.yaml +++ b/secrets.yaml @@ -9,33 +9,42 @@ sops: - recipient: age1s39d4mdrjhkf8cy8eea02p836r7s875fj8f7w3z4ld2stmaac49qd075ww enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBDU1dLa2I0TGxZU2tCbC84 - enZKaU1JSEV6K0srZURUWU8wc2RiME1XcEVzCldYeDJ6dFg5b1R3SzlQa3M2ZkRT - azZZTjBNWW5wMzliQWVNMTFVbk1ZTTQKLS0tIEJFS1BSUTlHYWR1OVZ5TTZqT3pZ - SDlaeG9YRWw4UVRLeWh1ZzlnUlBVc3cKeXyBZ7UA+6iHiXElOdht0obhY8REdxc5 - RX0HCXbn+wCEopmL9q/wRb4ClY2V1fExWGlwPz9teas1C5w6dQyYfQ== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBndWtDdC83Z2Y4QW9sWkRZ + QW82OWE4dmp0TW8vR1Zrd3g4UVhCaWplSGswCkx1emswalVka1dOaTFWd3M5UTBh + eDRVWkFvM0d5OW5BNVRTQjY1MWs5OVEKLS0tIGlkS1owM3h1akdtSFlBQ0JFRVc5 + c2JrU0gwNHNtemh2NDNoVis3MUhmdmcK4N1qbjdNwKDTP03gOvhvH6RRJnfCDJxZ + RHA3thFR17iFqcQ3woOKc0MGY4vIgWZYZoX4oYmo3kMGiUkcWtiOww== + -----END AGE ENCRYPTED FILE----- + - recipient: age1sx8ut0arwlrp7n7qvlaele8mq93pyvzc0ddetlk47cnyx935gcusdceq9q + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA0U2srVU1iR1FGZ0gxcUth + WDVOeDdZaWRaZDVLbnVHVkNDTWZjbTFqVW1NCmZHSnlWRklPdnFabkhmN0FqZlZL + cnR4eThjc0Z2SnVCVkMvQ3pZMDJYOG8KLS0tIFdwMzlWWkg1SFRVdHFCU1UwZmxG + b3E5bmZpN0tUclZjck4wUjFBUklOelkKf3v/9uVOgDp7olWyV50PMISVq8Ixf4+S + vLuXJ0kMeTuiW5CweAW9HiD01nwC+aRZaPn5JCLMoxWy/VVgMNNx1g== -----END AGE ENCRYPTED FILE----- lastmodified: "2026-02-08T17:12:36Z" mac: ENC[AES256_GCM,data:h/XWYq9wZeaFbulD1y/SUTqSSu8RnOJ0vrlXMq4d0FzdEElsddZGF4+tL2ZDWMh1u69vUU/yKbVOf02NqA5zhbWwuMB4IJfP7x42iakuvG1o5yQAXJYSI/hhwGHIw00U7ek6UcxY+j5U/52PANMA499zGJjU5u+HP89q71bL7NQ=,iv:LtRc1zIu+5iZhXvjLuuOpoE0seEGaPe1n+hYpxeZfyg=,tag:V3Chh4howYQ6FSPWlPVLsQ==,type:str] pgp: - - created_at: "2026-02-08T16:13:33Z" + - created_at: "2026-02-09T13:58:02Z" enc: |- -----BEGIN PGP MESSAGE----- - hQIMA/mKtLqB941HAQ/7BuEq3LeupBN6bNHOOdKszlEj0q/UoZULvSDAABF7EwVL - WCqqPe4N61HMXsAk41KiRRxqs9dc9KFtdRq89QZ/zZrN+cdk5GAfQikQNNdrGnfz - yZV7Rs/gZjeD0E73PH/YEucDXvDypcIHtgfydb9zxOhx9LLIJYxOSRL+QrftvwER - ah6ZIAPQ/O9TpqWPUoQlsKNu31WcN0iJK9a8MwCfGAsIym6E8xjyydtKHoJm8sNi - aMjJIttwoqJPXKinezp2pdb5lnI3EfP9uHFnHrhRBfP5Ex8F06ZjQ1wg08PzzYms - 9SGlMNdbhJXIPwty9/z3xrovJXTTOczty5wbTOTGaP6gdA6vNgmGXxG6ko19wyQf - R3IzPcmLIvi/KU4kpxP3h1ImnSo2QTWsTXJbCx+A73HB+Q6ygGDceRazeO8lXlxt - bucbEd7mRNhnXiyxMFVhVVFRN/WYcBnx7O36aRdOvo33CiWaXEqaGgYFagNU4OBI - 1Pj0WwG32ZIPyV4X2SsUdxPo9fHowSDRX7LrvIF63WXyFWu3hp/xVU/ZMaDzFkMa - nXh+QrcUbxomQ8MSJbi1Te3QgAoIabX5Efswn+eWi/HxNhR75y7ztHrnGrBJTMu5 - wunlhoGKp6/vVgWvxDjODZ/qZJ4P2xpnke3mf/3a8UUiR6gT+bXCXJ5LGd0D+VzS - XgEOQslT/HU2M+XMBJcJo47l/C1tIhaDnLfbhuKWUsxh1b3YlVKvHLd0nvVmXXL3 - 8yDk6J1f7FRl4Orj+Z077975EpDzMtAgq2u/x0cA4IgfZ2qDh3eEjJzoHzGgjq4= - =mJgc + hQIMA/mKtLqB941HAQ/9H3zo/TeVcacpBg9fM7CFIWu9rEe51Y1b5Tu23zpEtOoO + jGkBbdV/Ef8bhHcKOV+YyyjMtYeXGNWu8CNGfT0K6zGKesFZ3Y5dcgcLxTBOmPBZ + Gv0OgC/BQGegNC8PsnzWZXLK5WhAhta6gdcvhDZqAD15QXtgqquvyQ5FBQbF19ox + x6xq4UqKrREq1svFxInqXU9/o3/JvUPXFNLNZ02O1IkaLP5ceuPr3coj5ZNWMOJe + vNQj8wcdbZJZHKJJzZ8eFOK5MRT8cv+vzWr4CalJPYn9TjB/XypXiTRM7NrjjTOT + PApj9RwtHgz2cncyGbCQ5zptgG4vTlPRUn3GVoTkvw02g3dt9tKkPnVYtvoxprGR + lpF1kxezKgBsN0h68E4+VD6kbcc8T7Dy/f3fF1hmXf/Mojg05qY7+MsFZgUryu6P + EyZffhMS4O15Ltseh+bvJE2GQko2RRgsXPm/s8aQxmECPSZiCX3GHesUiW5/CeK8 + tRm9dqhlDZKANAiegf+maHedD/JKyhqAgcE3CNIj3cIWJlj0WH7O6rCmZZXggLxa + VaWvf+5hEa0Nvl2V71S+JvOJeyjV9tupa422o49NzQ4s1bXYnR3eaP1iIc27cQFX + /hscbZpc2oigWtaSkjafKgBZcAAoT6ZxGKDgYKwcnKVw14B2TEIRZFhpt/OSw6rS + XgHyEjsv3dbIxG2Qeze2dpnedA7KSkYqyY+RreZG+maTYQOvt2GfsVv2bu0jTK1/ + JStWb1Q8RpMpp+EyukITupArBQEbtzMYrgrxi7SGEeD/aOuqleB9E4a75qCwfYY= + =44+d -----END PGP MESSAGE----- fp: EF69F2FB25C8B5A66918EA91A38ACEAB9656CD94 unencrypted_suffix: _unencrypted |