From bcd92724d080e8d40d562b1f50fe7c7064461c05 Mon Sep 17 00:00:00 2001 From: Zoe Roux Date: Fri, 4 Jul 2025 16:04:02 +0200 Subject: [PATCH] Update stuff --- environments/hyprland/home.nix | 6 +- flake.lock | 78 +++++++++++++------------- hosts/fuhen/hardware-configuration.nix | 2 - modules/cli/tools/git.nix | 2 +- modules/cli/zsh/default.nix | 3 + modules/wm/default.nix | 5 ++ 6 files changed, 53 insertions(+), 43 deletions(-) diff --git a/environments/hyprland/home.nix b/environments/hyprland/home.nix index fb889af..08450bf 100644 --- a/environments/hyprland/home.nix +++ b/environments/hyprland/home.nix @@ -1,4 +1,8 @@ -{pkgs, ...}: { +{ + pkgs, + user, + ... +}: { imports = [ ../../modules/gui/home.nix ../../modules/wm/home.nix diff --git a/flake.lock b/flake.lock index 7073ccb..b6132a4 100644 --- a/flake.lock +++ b/flake.lock @@ -56,11 +56,11 @@ ] }, "locked": { - "lastModified": 1749398372, - "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", + "lastModified": 1751413152, + "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", + "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", "type": "github" }, "original": { @@ -116,11 +116,11 @@ ] }, "locked": { - "lastModified": 1749636823, - "narHash": "sha256-WUaIlOlPLyPgz9be7fqWJA5iG6rHcGRtLERSCfUDne4=", + "lastModified": 1750779888, + "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "623c56286de5a3193aa38891a6991b28f9bab056", + "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d", "type": "github" }, "original": { @@ -180,11 +180,11 @@ ] }, "locked": { - "lastModified": 1750304462, - "narHash": "sha256-Mj5t4yX05/rXnRqJkpoLZTWqgStB88Mr/fegTRqyiWc=", + "lastModified": 1751589297, + "narHash": "sha256-3q35cq6BPuwIRL3IoVKYPc72r3OleeuRyf4YAPjEqzA=", "owner": "nix-community", "repo": "home-manager", - "rev": "863842639722dd12ae9e37ca83bcb61a63b36f6c", + "rev": "83f978812c37511ef2ffaf75ffa72160483f738a", "type": "github" }, "original": { @@ -221,11 +221,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1750497580, - "narHash": "sha256-8XBME7+ErfNXJdz+q1T2+L87QS/tqfFvfreN0ynWp8s=", + "lastModified": 1751621149, + "narHash": "sha256-EMcJzAHjuhvsAWJtNpULuI0mYr3NJZf2Ta/o8swQ+E4=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "39763127ad62f962411336d9c7db62efc9f6ec67", + "rev": "d23aed1e00bf4e133f582fbd435eac02199db22c", "type": "github" }, "original": { @@ -237,11 +237,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1750433527, - "narHash": "sha256-p39wAp30YEmn9uKGxht08pvJG4SIofEFNzpzWdFyeKA=", + "lastModified": 1751582854, + "narHash": "sha256-IN8bOAfWPjs19mVmqYFQkFPduqvS7BhPlmi9V4ILCjQ=", "owner": "neovim", "repo": "neovim", - "rev": "d0aedd36dfe0ac4ed45ea93f471379c77f0c7905", + "rev": "14d8d116710dce6995d1e55fbf969ff7082b5e8d", "type": "github" }, "original": { @@ -257,11 +257,11 @@ ] }, "locked": { - "lastModified": 1750325256, - "narHash": "sha256-vvlxGz/waqJ3TGqM/iqXbnEc7/R1qnEXmaBiPaQ1RE0=", + "lastModified": 1751313918, + "narHash": "sha256-HsJM3XLa43WpG+665aGEh8iS8AfEwOIQWk3Mke3e7nk=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "0d71cbf88d63e938b37b85b3bf8b238bcf7b39b9", + "rev": "e04a388232d9a6ba56967ce5b53a8a6f713cdfcf", "type": "github" }, "original": { @@ -277,11 +277,11 @@ ] }, "locked": { - "lastModified": 1749960154, - "narHash": "sha256-EWlr9MZDd+GoGtZB4QsDzaLyaDQPGnRY03MFp6u2wSg=", + "lastModified": 1751170039, + "narHash": "sha256-3EKpUmyGmHYA/RuhZjINTZPU+OFWko0eDwazUOW64nw=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "424a40050cdc5f494ec45e46462d288f08c64475", + "rev": "9c932ae632d6b5150515e5749b198c175d8565db", "type": "github" }, "original": { @@ -292,11 +292,11 @@ }, "nixos-avf": { "locked": { - "lastModified": 1750484961, - "narHash": "sha256-qP8RgqOcllpsxcLCOngJ0Emr7ggwtuZ3yHwnqbIUcAs=", + "lastModified": 1750534406, + "narHash": "sha256-j779gJoRf08Ejoh4/oMrcnSxW/JKyeDJwtSbLZJPNNI=", "owner": "nix-community", "repo": "nixos-avf", - "rev": "fde5c1a6ef94e9da6710eee0b8e92587927447ed", + "rev": "3084090727dfdce21a733b995facda7b57f50f5e", "type": "github" }, "original": { @@ -307,11 +307,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1750431636, - "narHash": "sha256-vnzzBDbCGvInmfn2ijC4HsIY/3W1CWbwS/YQoFgdgPg=", + "lastModified": 1751432711, + "narHash": "sha256-136MeWtckSHTN9Z2WRNRdZ8oRP3vyx3L8UxeBYE+J9w=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "1552a9f4513f3f0ceedcf90320e48d3d47165712", + "rev": "497ae1357f1ac97f1aea31a4cb74ad0d534ef41f", "type": "github" }, "original": { @@ -344,11 +344,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1750365781, - "narHash": "sha256-XE/lFNhz5lsriMm/yjXkvSZz5DfvKJLUjsS6pP8EC50=", + "lastModified": 1751271578, + "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "08f22084e6085d19bcfb4be30d1ca76ecb96fe54", + "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", "type": "github" }, "original": { @@ -394,11 +394,11 @@ "tmux": { "flake": false, "locked": { - "lastModified": 1750438868, - "narHash": "sha256-e3sUJtf0jDmbKATwzDPw6z4m2l275I5s/6DMI2G/PeI=", + "lastModified": 1751454068, + "narHash": "sha256-YY9CJ2Z6hjC4kGjRswlps4hya5Lk/ksM9luJHW8Cags=", "owner": "tmux", "repo": "tmux", - "rev": "96244dd727617df1855a7e9cd1d98fdeafcf44a8", + "rev": "7e439539377e272f37d18bb10dbff374b87acee6", "type": "github" }, "original": { @@ -415,11 +415,11 @@ ] }, "locked": { - "lastModified": 1749194973, - "narHash": "sha256-eEy8cuS0mZ2j/r/FE0/LYBSBcIs/MKOIVakwHVuqTfk=", + "lastModified": 1750931469, + "narHash": "sha256-0IEdQB1nS+uViQw4k3VGUXntjkDp7aAlqcxdewb/hAc=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "a05be418a1af1198ca0f63facb13c985db4cb3c5", + "rev": "ac8e6f32e11e9c7f153823abc3ab007f2a65d3e1", "type": "github" }, "original": { @@ -435,11 +435,11 @@ ] }, "locked": { - "lastModified": 1750219862, - "narHash": "sha256-wce+erYDBm6wpLJm6IJh85KYqy/NtdKp6DZQCn4YP1Q=", + "lastModified": 1751515999, + "narHash": "sha256-UtRPrxX+QW3o78d1HhzXqQAIoVP6qLElLA2IO6/99/w=", "owner": "youwen5", "repo": "zen-browser-flake", - "rev": "18d6cd2f5a9cd1527d478d4f716e9b9ee6fb6cbb", + "rev": "49afeb199b023f65429879b7bfd7b34ac7aaf351", "type": "github" }, "original": { diff --git a/hosts/fuhen/hardware-configuration.nix b/hosts/fuhen/hardware-configuration.nix index 8887592..61095e4 100644 --- a/hosts/fuhen/hardware-configuration.nix +++ b/hosts/fuhen/hardware-configuration.nix @@ -78,7 +78,5 @@ ]; }; - git.useRsa = true; - system.stateVersion = "22.11"; } diff --git a/modules/cli/tools/git.nix b/modules/cli/tools/git.nix index f313388..c405d7f 100644 --- a/modules/cli/tools/git.nix +++ b/modules/cli/tools/git.nix @@ -8,7 +8,7 @@ signing = { signByDefault = true; key = - if config.git.useRsa + if true #config.git.useRsa then "~/.ssh/id_rsa.pub" else "~/.ssh/id_ed25519.pub"; }; diff --git a/modules/cli/zsh/default.nix b/modules/cli/zsh/default.nix index 1f5dd43..1583356 100644 --- a/modules/cli/zsh/default.nix +++ b/modules/cli/zsh/default.nix @@ -62,6 +62,9 @@ # add labels, replace type by fstype, use a single mountpoint lsblk = "lsblk -o name,label,size,rm,ro,fstype,uuid,mountpoint"; dr = "direnv reload"; + nixos-option = "nixos-option --flake ~/projects/flake"; + # i will never remember those flags + ss = "ss -tlpun"; # viu doesn't work with tmux, icat does. using that while waiting viu = "kitty +kitten icat"; diff --git a/modules/wm/default.nix b/modules/wm/default.nix index 6643fa6..4947f05 100644 --- a/modules/wm/default.nix +++ b/modules/wm/default.nix @@ -47,4 +47,9 @@ "${pkgs.gtk3}/share/gsettings-schemas/${pkgs.gtk3.name}" "${pkgs.gsettings-desktop-schemas}/share/gsettings-schemas/${pkgs.gsettings-desktop-schemas.name}" ]; + + services.sunshine = { + enable = true; + capSysAdmin = true; + }; }