From a05422ff0db1cd6f49d3dc7d12981faadd8cca66 Mon Sep 17 00:00:00 2001 From: alsaiduq-lab Date: Thu, 1 Jan 2026 17:32:16 -0700 Subject: [PATCH] changed --- flake.lock | 32 ++++++++++++++--------------- home-manager/cobray.nix | 15 +++----------- home-manager/modules/gremlin.nix | 2 ++ home-manager/modules/lazygit.nix | 10 +++++---- home-manager/modules/quickshell.nix | 1 + home-manager/modules/udiskie.nix | 5 +++++ hosts/modules/hyprland.nix | 22 ++++++++------------ hosts/system-packages.nix | 1 - 8 files changed, 41 insertions(+), 47 deletions(-) create mode 100644 home-manager/modules/udiskie.nix diff --git a/flake.lock b/flake.lock index 3ba1291..398ceb0 100644 --- a/flake.lock +++ b/flake.lock @@ -64,11 +64,11 @@ "quickshell": "quickshell" }, "locked": { - "lastModified": 1767213761, - "narHash": "sha256-DRGKMzx/hq4TQvhtEB+BjkXZ6UIV4V9gmCNDy4dKSJk=", + "lastModified": 1767299095, + "narHash": "sha256-a/DHoBafFIrhkN0FSNSk5fbWrslBptnkgs/LDk5QzEY=", "owner": "AvengeMedia", "repo": "DankMaterialShell", - "rev": "37f972d0750a7e739e58bb352a626622954d4098", + "rev": "bae32e51ff6d873e51e29fe20fee378714aba150", "type": "github" }, "original": { @@ -191,11 +191,11 @@ "zon2nix": "zon2nix" }, "locked": { - "lastModified": 1767218016, - "narHash": "sha256-YrI3kmaTDcIEKATPFDhn/gUJ06m4t5NuQshKISHmQmo=", + "lastModified": 1767302070, + "narHash": "sha256-hfbgjYOP+YC5w2AcWK1fn5h0JyG4GI9UPUmKmBI+oVc=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "3a89c8ac5493636530129c80a32d29aa7ec45f03", + "rev": "9a21e563114b8b1eb1501d03a087af8d23e508d3", "type": "github" }, "original": { @@ -380,11 +380,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1767201430, - "narHash": "sha256-2FF66EaIbsc7CL1jKHbRFslSePDq40fzlTTbUlm5v3k=", + "lastModified": 1767300597, + "narHash": "sha256-kr8ThYlgv/cvwbYnqy/EAoYtAi3W5XMlmrXtF1YnUmo=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "48a024e0322bbd7c4c88126498ec478444ec4cb2", + "rev": "31d3181e1ee91e338fb4fb8207d64b8d689310fc", "type": "github" }, "original": { @@ -396,11 +396,11 @@ "hyprland-dots": { "flake": false, "locked": { - "lastModified": 1760065789, - "narHash": "sha256-RlAnAGqJhiY/KR2fP0qWHuBkPwp/QtAJ1gqTZxcqXuk=", + "lastModified": 1767234512, + "narHash": "sha256-s7e3tsx5Nr8RIGWCNZHQuh1wBHOik93HxHqs5dXLURI=", "ref": "refs/heads/master", - "rev": "efbe70f5616e59bde1b8cff1813e27c5a9271b12", - "revCount": 23, + "rev": "ef856f3eb18059621a618e62612f028dd6ea5869", + "revCount": 26, "type": "git", "url": "ssh://git@github.com/alsaiduq-lab/hyprland-dots" }, @@ -1038,11 +1038,11 @@ }, "unstable": { "locked": { - "lastModified": 1767151656, - "narHash": "sha256-ujL2AoYBnJBN262HD95yer7QYUmYp5kFZGYbyCCKxq8=", + "lastModified": 1767242400, + "narHash": "sha256-knFaYjeg7swqG1dljj1hOxfg39zrIy8pfGuicjm9s+o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f665af0cdb70ed27e1bd8f9fdfecaf451260fc55", + "rev": "c04833a1e584401bb63c1a63ddc51a71e6aa457a", "type": "github" }, "original": { diff --git a/home-manager/cobray.nix b/home-manager/cobray.nix index 528038e..3dd9959 100644 --- a/home-manager/cobray.nix +++ b/home-manager/cobray.nix @@ -1,9 +1,6 @@ { pkgs, config, - lib, - hyprlanddots, - nvimDotfiles, inputs, ... }: { @@ -26,12 +23,12 @@ ./modules/ani-cli.nix ./modules/quickshell.nix ./modules/cava.nix - ./modules/rgb.nix ./modules/imagemagick.nix inputs.dankMaterialShell.homeModules.dank-material-shell ./modules/viv.nix ./modules/godot.nix ./modules/gremlin.nix + ./modules/udiskie.nix ]; home.username = "${config.theme.user}"; @@ -39,14 +36,8 @@ home.stateVersion = "25.11"; programs.home-manager.enable = true; home.enableNixpkgsReleaseCheck = false; - xdg.mime.enable = false; # TODO: move these somewhere else; undecided - home.packages = with pkgs; [ - kdePackages.dolphin - voicevox - vkbasalt - hashcat - libretranslate - ]; + #home.packages = with pkgs; [ + #]; } diff --git a/home-manager/modules/gremlin.nix b/home-manager/modules/gremlin.nix index 4a8979f..1fd8581 100644 --- a/home-manager/modules/gremlin.nix +++ b/home-manager/modules/gremlin.nix @@ -1,5 +1,7 @@ {pkgs, ...}: { home.packages = with pkgs; [ desktop-gremlin + voicevox + libretranslate ]; } diff --git a/home-manager/modules/lazygit.nix b/home-manager/modules/lazygit.nix index 8a55885..34a279f 100644 --- a/home-manager/modules/lazygit.nix +++ b/home-manager/modules/lazygit.nix @@ -10,16 +10,18 @@ gh diff-so-fancy ]; - programs.git = { enable = true; includes = [ - {path = "${config.home.homeDirectory}/nix/.secrets/.git-config";} + {path = "${config.home.homeDirectory}/nix/.secrets/.gitconfig";} ]; settings = { - user.name = "alsaiduq-lab"; - user.email = "riiidge.racer@gmail.com"; credential.helper = "store --file=${config.home.homeDirectory}/nix/.secrets/.git-credentials"; + init.defaultBranch = "master"; + push.autoSetupRemote = true; + pull.rebase = true; + core.pager = "diff-so-fancy | less --tabs=4 -RF"; + interactive.diffFilter = "diff-so-fancy --patch"; }; }; } diff --git a/home-manager/modules/quickshell.nix b/home-manager/modules/quickshell.nix index 34fd77b..76c38a7 100644 --- a/home-manager/modules/quickshell.nix +++ b/home-manager/modules/quickshell.nix @@ -10,6 +10,7 @@ dgop ddcutil cliphist + kdePackages.dolphin ]; home.sessionPath = ["${pkgs.quickshell}/bin"]; } diff --git a/home-manager/modules/udiskie.nix b/home-manager/modules/udiskie.nix new file mode 100644 index 0000000..bbd3c10 --- /dev/null +++ b/home-manager/modules/udiskie.nix @@ -0,0 +1,5 @@ +{pkgs, ...}: { + home.packages = with pkgs; [ + udiskie + ]; +} diff --git a/hosts/modules/hyprland.nix b/hosts/modules/hyprland.nix index 1c5ac95..b4dc2ff 100644 --- a/hosts/modules/hyprland.nix +++ b/hosts/modules/hyprland.nix @@ -27,23 +27,18 @@ security.polkit.enable = true; services.accounts-daemon.enable = true; - - systemd.user.services.hyprpolkitagent = { - enable = true; - description = "hyprpolkitagent"; - wantedBy = ["graphical-session.target"]; - wants = ["graphical-session.target"]; - after = ["graphical-session.target"]; - serviceConfig = { - Type = "simple"; - ExecStart = "${pkgs.hyprpolkitagent}/libexec/hyprpolkitagent"; - Restart = "on-failure"; - RestartSec = 1; - TimeoutStopSec = 10; + systemd.user.targets.graphical-session = { + unitConfig = { + RefuseManualStart = false; + StopWhenUnneeded = false; }; + wantedBy = ["default.target"]; }; environment.systemPackages = with pkgs; [ + (writeShellScriptBin "hyprpolkitagent" '' + exec ${hyprpolkitagent}/libexec/hyprpolkitagent "$@" + '') qt5.qtwayland qt6.qtwayland candy-icons @@ -57,7 +52,6 @@ wofi hyprshot hypridle - hyprpolkitagent grim-hyprland slurp swappy diff --git a/hosts/system-packages.nix b/hosts/system-packages.nix index 5884da3..3963d1c 100644 --- a/hosts/system-packages.nix +++ b/hosts/system-packages.nix @@ -33,7 +33,6 @@ ./modules/searxng.nix ./modules/nano.nix ./modules/qt.nix - ./modules/udiskie.nix ./modules/appimage.nix ./modules/greeter.nix ./modules/go.nix