diff --git a/flake.lock b/flake.lock index 1fb8902..bf17cbe 100644 --- a/flake.lock +++ b/flake.lock @@ -235,11 +235,11 @@ ] }, "locked": { - "lastModified": 1754924470, - "narHash": "sha256-asI/or9AcUMydwzodCgpHGytnMSNUlciw3uaycpXm4E=", + "lastModified": 1755397986, + "narHash": "sha256-qwrF5laj6eE3Zht0wKYTmH6QzL7bdOyE2f6jd3WCO8g=", "owner": "nix-community", "repo": "home-manager", - "rev": "67393957c27b4e4c6c48a60108a201413ced7800", + "rev": "8b4ac149687e8520187a66f05e9d4eafebf96522", "type": "github" }, "original": { @@ -342,11 +342,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1754935293, - "narHash": "sha256-aLnHm/FPjPR8Flv8ixBk+bmd10A8BZvtLe2i9WTzNfU=", + "lastModified": 1755416233, + "narHash": "sha256-tydnBQmV8pPHPlvq7sTEOEhkjXnYaeJtMN+77Rf/1NU=", "ref": "refs/heads/main", - "rev": "cb6589db98325705cef5dcaf92ccdf41ab21386d", - "revCount": 6358, + "rev": "251288ec5942b3544ad31de1299569284d80f0d7", + "revCount": 6370, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -564,11 +564,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1753819183, - "narHash": "sha256-KjuaXO9pdSHwpnsdj+TXqLDVZ8EhqfV5duSzIssBlzY=", + "lastModified": 1755112136, + "narHash": "sha256-eYLtZJayWWbKBC3u/gvDSqVyffuD+egryr7zPWRAeyY=", "owner": "hyprwm", "repo": "hyprsunset", - "rev": "233aaccdbdd20af848be3f30ab318342e28cd7e3", + "rev": "1f9afca28fac5f490e5f232e6f1887a69ff34896", "type": "github" }, "original": { @@ -759,11 +759,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1754564048, - "narHash": "sha256-dz303vGuzWjzOPOaYkS9xSW+B93PSAJxvBd6CambXVA=", + "lastModified": 1755330281, + "narHash": "sha256-aJHFJWP9AuI8jUGzI77LYcSlkA9wJnOIg4ZqftwNGXA=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "26ed7a0d4b8741fe1ef1ee6fa64453ca056ce113", + "rev": "3dac8a872557e0ca8c083cdcfc2f218d18e113b0", "type": "github" }, "original": { @@ -933,11 +933,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1754725699, - "narHash": "sha256-iAcj9T/Y+3DBy2J0N+yF9XQQQ8IEb5swLFzs23CdP88=", + "lastModified": 1755186698, + "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "85dbfc7aaf52ecb755f87e577ddbe6dbbdbc1054", + "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c", "type": "github" }, "original": { @@ -954,11 +954,11 @@ "nixvim": "nixvim_2" }, "locked": { - "lastModified": 1754172548, - "narHash": "sha256-8lWMN23VGQHTN5Kg5Kz1UMakt42brOlMz2IKxFBvKog=", + "lastModified": 1755007783, + "narHash": "sha256-mxKUvsLy6Nf8Td8jQ0Q7q+A+FcTuYMyp/qmnnCRK1QE=", "owner": "ahwxorg", "repo": "nixvim-config", - "rev": "fe2f1c27fa532489800b8f4d17f12c13299afa8d", + "rev": "d4b1e0a37718bd4b704c5c055151135094d911eb", "type": "github" }, "original": { @@ -993,11 +993,11 @@ "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1754935554, - "narHash": "sha256-5qa0fxwxmrNCiKqdfXKx8t4tn9E0aenG8IZcWFV/Jco=", + "lastModified": 1755435577, + "narHash": "sha256-Rgcfyl8sWF+Uxe2HM51kJ72aNtaoy/UPiblwGTZHANU=", "owner": "nix-community", "repo": "NUR", - "rev": "ac764b3412faeed1a37c7d21f30bc0fbe547f773", + "rev": "199390e7082f9307578531d389cccd9f37412156", "type": "github" }, "original": { @@ -1091,11 +1091,11 @@ "nixpkgs": "nixpkgs_10" }, "locked": { - "lastModified": 1754328224, - "narHash": "sha256-glPK8DF329/dXtosV7YSzRlF4n35WDjaVwdOMEoEXHA=", + "lastModified": 1754988908, + "narHash": "sha256-t+voe2961vCgrzPFtZxha0/kmFSHFobzF00sT8p9h0U=", "owner": "Mic92", "repo": "sops-nix", - "rev": "49021900e69812ba7ddb9e40f9170218a7eca9f4", + "rev": "3223c7a92724b5d804e9988c6b447a0d09017d48", "type": "github" }, "original": { diff --git a/hosts/sakura/default.nix b/hosts/sakura/default.nix index 41fb1a0..f901a81 100644 --- a/hosts/sakura/default.nix +++ b/hosts/sakura/default.nix @@ -56,6 +56,7 @@ # powertop.enable = true; cpuFreqGovernor = lib.mkDefault "ondemand"; }; + # change battery led to blue on suspend to indicate device is in suspend mode systemd.services."suspend-led-set" = { description = "blue led for sleep"; @@ -80,7 +81,6 @@ ''; services.logind.lidSwitch = "suspend"; boot = { - # plymouth.enable = true; # is a module now kernelParams = [ "mem_sleep_default=deep" "acpi_osi=\"!Windows 2020\"" # otherwise GPU does weird shit that makes the computer look like the RAM is broken diff --git a/hosts/violet/default.nix b/hosts/violet/default.nix index d361648..b9e9a0c 100644 --- a/hosts/violet/default.nix +++ b/hosts/violet/default.nix @@ -22,7 +22,8 @@ time.timeZone = "Europe/Amsterdam"; environment.systemPackages = with pkgs; [ - pkgs.kitty.terminfo + kitty.terminfo + cifs-utils ]; services = { @@ -62,4 +63,14 @@ ] ++ [ pkgs.cpupower-gui ]; }; + + fileSystems."/mnt/nfs/violet" = { + device = "//172.16.10.130/spinners/violet"; # not ideal, should get the static IP from dandelion from a config attribute but whatever... + fsType = "cifs"; + options = [ + "x-systemd.automount" + "noauto" + "credentials=${config.sops.secrets.smbLoginDetails.path}" + ]; + }; } diff --git a/modules/core/sops.nix b/modules/core/sops.nix index e457888..27b1c10 100644 --- a/modules/core/sops.nix +++ b/modules/core/sops.nix @@ -22,6 +22,7 @@ "matrixRegistrationSecret" = { owner = "matrix-synapse"; }; + "smbLoginDetails" = { }; } else if (host == "sakura") then { diff --git a/modules/home/zsh.nix b/modules/home/zsh.nix index 0408d7f..fa1f4b6 100644 --- a/modules/home/zsh.nix +++ b/modules/home/zsh.nix @@ -147,6 +147,19 @@ zle -N nix-search-fzf-shell-widget bindkey '^O' nix-search-fzf-shell-widget + # Use fzf as a history widget + zle -N fzf-history-widget + bindkey '^R' fzf-history-widget + bindkey -M viins '^R' fzf-history-widget + bindkey -M vicmd '^R' fzf-history-widget + + # Use fzf as a cd completion widget + zle -N fzf-cd-widget + bindkey '^G' fzf-cd-widget + + # Use fzf as a file completion widget + zle -N fzf-file-widget + bindkey '^F' fzf-file-widget # if [[ $(which sxiv&>/dev/null && echo 1) == "1" ]]; then # alias imv="sxiv" @@ -172,8 +185,7 @@ g = "git"; gp = "git pull"; - calc = "eva"; - wikipedia = "wikit"; + wiki = "wikit"; }; }; @@ -262,9 +274,18 @@ sha256 = "0na6b5b46k4473c53mv1wkb009i6b592gxpjq94bdnlz1kkcqwg6"; }; } + { + name = "fzf-zsh-plugin"; + src = fetchFromGitHub { + owner = "unixorn"; + repo = "fzf-zsh-plugin"; + rev = "04ae801499a7844c87ff1d7b97cdf57530856c65"; + sha256 = "sha256-FEGhx36Z5pqHEOgPsidiHDN5SXviqMsf6t6hUZo+I8A="; + }; + file = "fzf-zsh-plugin.plugin.zsh"; + } ]; }; - fzf = { enable = true; enableZshIntegration = true; diff --git a/roles/gui.nix b/roles/gui.nix index ca6cc4b..ff059bd 100644 --- a/roles/gui.nix +++ b/roles/gui.nix @@ -17,7 +17,10 @@ in config = mkIf cfg.enable { services = { - gvfs.enable = true; + gvfs = { + enable = true; + package = lib.mkForce pkgs.gnome.gvfs; + }; gnome.gnome-keyring.enable = true; dbus.enable = true; }; diff --git a/secrets/violet/secrets.yaml b/secrets/violet/secrets.yaml index f497f8d..f8d5015 100644 --- a/secrets/violet/secrets.yaml +++ b/secrets/violet/secrets.yaml @@ -2,6 +2,7 @@ systemMailerPassword: ENC[AES256_GCM,data:b1fvCLZMiA9xDu/9BKQGnCTbwj46uixlo37qer forgejoWorkerSecret: ENC[AES256_GCM,data:kmUjukTJ9SP6nJvfhIMFVTu5vAc9TIfZidUgejC7FSNBDJiP/lVlHw==,iv:jF9LpWLxtBi5i5NCC5nkLeLqJQzOAIY7H1z2NfHqUQI=,tag:3mtTcn+LQEbCESlt34nf9g==,type:str] matrixRegistrationSecret: ENC[AES256_GCM,data:xDFYVpBJa+FHWjmLlZspJAzJcoav53nWPoctQ5+gAnDYMurtSCkmoQn8r5j6fOmiy56KQyk8AD2/kT1HeFFNKA==,iv:82eIoh1ePc0VxfTbBPxpwGhYrcdRMI6WjFhlUJhxuHk=,tag:FAYUXUy0lEQU56ni2dxvbg==,type:str] minioRootCredentials: ENC[AES256_GCM,data:/IrpspB6Puy+6scHheBSBp6zQVh8uwpu4nFPLSkueuohSUESPHbRb0w1XAp4V5HraMtOThFqlm0JeBW0XbhY4E8L1P+S3/aMLKjp2voA928l9AjF6sTaSKsO7qh6LEmo90qm9Jo0nDo=,iv:M5NOGfSsl+LggLyEjV49vcWCaYmbG0eJcgwI2v7AKcI=,tag:A+CrDTL+TkEayOqBUII4aQ==,type:str] +smbLoginDetails: ENC[AES256_GCM,data:Puv+Vewv0TDpiYM+Uym180CLT+vXKoeSW/uNxAX7f9y0NvG2Uqqglj/HcCMhyQn9GpCIQyb+xidlLWn3Ywdg6ybaf4WN5EdAEXMK/FRQyVIvvOcCcwG+IeUc1Wc5NmM2qEbxLqLNDWxiH8/QsrT9rWWxxx4c4eD1HOpIv9LCuavXXLmKy6JvtxYwtOv4u8ukp+e0uP7pLN7d,iv:XH+6soi7lZiGz9ZGlQb49f44API715ib/Y7Zh3hFnDM=,tag:iz8RYRSwNxrMxy+rqeM07Q==,type:str] sops: age: - recipient: age1yzapmznelujajfyrpw5mxmy86ckg377494w5ap4yej39jatewursfxls9w @@ -22,7 +23,7 @@ sops: S3pjSjlhZjZiSDBNakhLVzNKMjd3bWsKC2geLVXFp190lkjxtmZKq8aLN0XMNeAI VqbwIY3a30iuWAaxqf8h1ZuCGJvbAZZBevFZraj9yktRHc54JV3Aww== -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-08-17T12:59:12Z" - mac: ENC[AES256_GCM,data:d0fls75JYsDd4QyF1lUi6CGinPJBRNOwgHg4fbnp40P/5rhGZsH8dL9+n2qQjCqEWPtBDbAGz0LYQ8T/VxaNHQwuvCX1Q1LCjlwbrZHEMLXNhd3VOa4b7e9k8+mgccLKDj52PlXSNxW+ATplZSTCMFnrBuDkfiW09gz8He8s8jo=,iv:v8XNLDFu1VhQ7A+CpimWJb95YvzRCWpgqRj6Uhx5wLU=,tag:kAg/NDen7VkMrOfV92SEkA==,type:str] + lastmodified: "2025-08-19T12:23:05Z" + mac: ENC[AES256_GCM,data:hH3cTyHeFMTH5zYpCWyM1uqLta/uzQcLc5HPSdsR52Skh89/5h51vC666g0JuVm/sXh3gv6XQ1AGidPMAmx60qmHjiWE/LRli7xDwKk3p4mldC7RC2FrR0JPmfhDzXIo7VL60PCq4CPWevyRpAWMEMgnc3Z/IzmfDObUsvU+rg0=,iv:CrL4uqV8keGMw+tuqvkNrpKoM0qqr1vsdhESPUb+Hig=,tag:O2NKejf2dpkrkTzX1IfQcA==,type:str] unencrypted_suffix: _unencrypted version: 3.10.2