diff --git a/flake.lock b/flake.lock index 10d9f3d..2f2d645 100644 --- a/flake.lock +++ b/flake.lock @@ -24,17 +24,14 @@ "agents": { "flake": false, "locked": { - "lastModified": 1767965833, - "narHash": "sha256-8tKEfJU4bxlgPJwUTUDQkVJMbwWQMiYt+moLjMIFeVY=", - "ref": "refs/heads/master", - "rev": "3e20c82603a4ddedf04ff001adf943723a49dc37", - "revCount": 7, - "type": "git", - "url": "https://code.m3ta.dev/m3tam3re/AGENTS" + "lastModified": 1768033296, + "narHash": "sha256-usQS87XQkl3VwBvdmKvxrxQuZGSLzKIu3q8P4cDhrCU=", + "path": "/home/m3tam3re/p/MISC/AGENTS", + "type": "path" }, "original": { - "type": "git", - "url": "https://code.m3ta.dev/m3tam3re/AGENTS" + "path": "/home/m3tam3re/p/MISC/AGENTS", + "type": "path" } }, "base16-schemes": { @@ -243,8 +240,8 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1768021270, - "narHash": "sha256-T6xgoK73y5me8UNZUVQ1peySNM1m+fY0Vb5ZqG1YU/Q=", + "lastModified": 1768034354, + "narHash": "sha256-wAbsISiUqTlzs9KaLQqGEs25ZBw7X+d4euQ8OHmMgRc=", "path": "/home/m3tam3re/p/NIX/nixpkgs", "type": "path" }, diff --git a/flake.nix b/flake.nix index 8934457..feab898 100644 --- a/flake.nix +++ b/flake.nix @@ -45,8 +45,8 @@ nix-colors.url = "github:misterio77/nix-colors"; agents = { - # url = "path:/home/m3tam3re/p/MISC/AGENTS"; - url = "git+https://code.m3ta.dev/m3tam3re/AGENTS"; + url = "path:/home/m3tam3re/p/MISC/AGENTS"; + # url = "git+https://code.m3ta.dev/m3tam3re/AGENTS"; flake = false; }; }; diff --git a/home/features/coding/opencode.nix b/home/features/coding/opencode.nix index ddfa23c..0965512 100644 --- a/home/features/coding/opencode.nix +++ b/home/features/coding/opencode.nix @@ -79,7 +79,7 @@ "$schema" = "https://raw.githubusercontent.com/code-yeongyu/oh-my-opencode/master/assets/oh-my-opencode.schema.json"; agents = { Sisyphus = { - model = "opencode/claude-opus-4-5"; + model = "opencode/glm-4.7-free"; permission = { edit = "allow"; bash = { @@ -139,28 +139,28 @@ }; }; librarian = { - model = "opencode/claude-sonnet-4-5"; + model = "opencode/glm-4.7-free"; permission = { edit = "deny"; bash = "deny"; }; }; explore = { - model = "opencode/claude-sonnet-4-5"; + model = "opencode/glm-4.7-free"; permission = { edit = "deny"; bash = "deny"; }; }; oracle = { - model = "opencode/claude-sonnet-4-5"; + model = "opencode/glm-4.7-free"; permission = { edit = "deny"; bash = "deny"; }; }; frontend-ui-ux-engineer = { - model = "opencode/claude-opus-4-5"; + model = "opencode/glm-4.7-free"; permission = { edit = "allow"; bash = { @@ -180,14 +180,14 @@ }; }; document-writer = { - model = "opencode/claude-opus-4-5"; + model = "opencode/glm-4.7-free"; permission = { edit = "allow"; bash = "deny"; }; }; multimodal-looker = { - model = "opencode/claude-opus-4-5"; + model = "opencode/glm-4.7-free"; permission = { edit = "deny"; bash = "deny"; diff --git a/home/features/desktop/default.nix b/home/features/desktop/default.nix index a22e429..fc6713c 100644 --- a/home/features/desktop/default.nix +++ b/home/features/desktop/default.nix @@ -13,6 +13,7 @@ ./office.nix ./rofi.nix ./theme.nix + ./wallpapers.nix ./wayland.nix ./webapps.nix ]; @@ -144,7 +145,7 @@ # google-chrome # gsettings-desktop-schemas # graphviz - # ksnip + ksnip msty-studio nwg-look # pamixer diff --git a/home/features/desktop/hyprland.nix b/home/features/desktop/hyprland.nix index 45b0566..5a9a523 100644 --- a/home/features/desktop/hyprland.nix +++ b/home/features/desktop/hyprland.nix @@ -18,9 +18,7 @@ in { exec-once = [ "hyprpanel" - "hyprpaper" - "hyprpaper-random" - "hypridle" + "while ! hyprpaper-random; do sleep 0.5; done" "wl-paste --type text --watch cliphist store" # Stores only text data "wl-paste --type image --watch cliphist store" # Stores only image data "wl-paste -p -t text --watch clipman store -P --histpath=\"~/.local/share/clipman-primary.json\"" ]; @@ -152,6 +150,7 @@ in { "match:initial_title .*streamlabs.com.*, decorate off" "match:initial_title .*streamlabs.com.*, no_shadow on" "match:initial_title .*streamlabs.com.*, no_blur on" + "border_color rgb(ffffff), match:xwayland 1" ]; "$mainMod" = "SUPER"; "$terminal" = "kitty"; @@ -175,6 +174,7 @@ in { "$mainMod SHIFT, V, togglefloating" "$mainMod, D, exec, uwsm app -- rofi -show drun -run-command \"uwsm app -- {cmd}\"" "$mainMod, V, exec, uwsm app -- cliphist list | rofi -dmenu | cliphist decode | wl-copy" + "$mainMod, C, exec, bash -c 'FILE=/tmp/screenshot_$(date +%s).png; grim -g \"$(slurp)\" \"$FILE\" && ksnip \"$FILE\"'" "$mainMod SHIFT, S, exec, uwsm app -- rofi -show emoji" "$mainMod, P, exec, uwsm app -- rofi-pass" "$mainMod SHIFT, P, pseudo" @@ -216,5 +216,100 @@ in { ]; }; }; + services.hypridle = { + enable = true; + settings = { + general = { + before_sleep_cmd = "hyprlock"; + after_sleep_cmd = "hyprctl dispatch dpms on"; + inhibit_sleep = 3; + }; + + listener = [ + { + timeout = 300; # 5 min + on-timeout = "hyprlock"; + } + { + timeout = 420; # 5.5 min + on-timeout = "hyprctl dispatch dpms off"; + on-resume = "hyprctl dispatch dpms on"; + } + ]; + }; + }; + + services.hyprpaper.enable = true; + + programs.hyprlock = { + enable = true; + settings = { + "$font" = "JetBrainsMono Nerd Font"; + "$base" = "rgb(${config.colorScheme.palette.base00})"; + "$text" = "rgb(${config.colorScheme.palette.base05})"; + "$textAlpha" = "${config.colorScheme.palette.base05}"; + "$accentAlpha" = "${config.colorScheme.palette.base0D}"; + "$red" = "rgb(${config.colorScheme.palette.base08})"; + "$yellow" = "rgb(${config.colorScheme.palette.base0A})"; + + general = { + hide_cursor = true; + }; + + background = { + monitor = ""; + path = "${config.home.homeDirectory}/.config/hypr/wallpapers/wallhaven-lmmo8r.jpg"; + blur_passes = 0; + color = "rgb(${config.colorScheme.palette.base00})"; + }; + + label = [ + { + monitor = ""; + text = "$TIME"; + color = "$text"; + font_size = 90; + font_family = "$font"; + position = "30, 0"; + halign = "left"; + valign = "top"; + } + { + monitor = ""; + text = ''cmd[update:43200000] echo "$(date +"%A, %d %B %Y")"''; + color = "$text"; + font_size = 25; + font_family = "$font"; + position = "30, -150"; + halign = "left"; + valign = "top"; + } + ]; + + input-field = [ + { + monitor = ""; + size = "300, 60"; + outline_thickness = 4; + dots_size = 0.2; + dots_spacing = 0.2; + dots_center = true; + outer_color = "rgb(${config.colorScheme.palette.base0D})"; + inner_color = "rgb(${config.colorScheme.palette.base00})"; + font_color = "rgb(${config.colorScheme.palette.base05})"; + fade_on_empty = false; + placeholder_text = ''󰌾 Logged in as $USER''; + hide_input = false; + check_color = "rgb(${config.colorScheme.palette.base0D})"; + fail_color = "rgb(${config.colorScheme.palette.base08})"; + fail_text = ''$FAIL ($ATTEMPTS)''; + capslock_color = "rgb(${config.colorScheme.palette.base0A})"; + position = "0, -35"; + halign = "center"; + valign = "center"; + } + ]; + }; + }; }; } diff --git a/home/features/desktop/rofi.nix b/home/features/desktop/rofi.nix index 9e2c5c1..e4ef53c 100644 --- a/home/features/desktop/rofi.nix +++ b/home/features/desktop/rofi.nix @@ -190,6 +190,10 @@ in { path = "~/p/CHAT"; args = "--agent chiron"; }; + MISC = { + path = "~/p/MISC"; + args = "--agent chiron-forge"; + }; }; terminal = pkgs.kitty; terminalCommand = "opencode %a"; diff --git a/home/features/desktop/wallpapers.nix b/home/features/desktop/wallpapers.nix new file mode 100644 index 0000000..fbc6a27 --- /dev/null +++ b/home/features/desktop/wallpapers.nix @@ -0,0 +1,18 @@ +{ + config, + lib, + pkgs, + ... +}: +with lib; let + cfg = config.features.desktop.wallpapers; +in { + options.features.desktop.wallpapers = mkEnableOption "Wallpapers for Hyprland"; + + config = mkIf cfg { + xdg.configFile."hypr/wallpapers" = { + source = ../../m3tam3re/wallpapers; + recursive = true; + }; + }; +} diff --git a/home/m3tam3re/m3-ares.nix b/home/m3tam3re/m3-ares.nix index 6603fe9..c85836f 100644 --- a/home/m3tam3re/m3-ares.nix +++ b/home/m3tam3re/m3-ares.nix @@ -57,6 +57,7 @@ with lib; { rofi.enable = true; fonts.enable = true; wayland.enable = true; + wallpapers = true; }; }; } diff --git a/home/m3tam3re/m3-kratos.nix b/home/m3tam3re/m3-kratos.nix index 689e69a..224d7ef 100644 --- a/home/m3tam3re/m3-kratos.nix +++ b/home/m3tam3re/m3-kratos.nix @@ -56,6 +56,7 @@ with lib; { rofi.enable = true; fonts.enable = true; wayland.enable = true; + wallpapers = true; }; }; } diff --git a/home/m3tam3re/wallpapers/wallhaven-28kdom_2560x1440.png b/home/m3tam3re/wallpapers/wallhaven-28kdom_2560x1440.png new file mode 100644 index 0000000..326dfd6 Binary files /dev/null and b/home/m3tam3re/wallpapers/wallhaven-28kdom_2560x1440.png differ diff --git a/home/m3tam3re/wallpapers/wallhaven-8o8y5o_2560x1440.png b/home/m3tam3re/wallpapers/wallhaven-8o8y5o_2560x1440.png new file mode 100644 index 0000000..cf48678 Binary files /dev/null and b/home/m3tam3re/wallpapers/wallhaven-8o8y5o_2560x1440.png differ diff --git a/home/m3tam3re/wallpapers/wallhaven-k72v6q_2560x1440.png b/home/m3tam3re/wallpapers/wallhaven-k72v6q_2560x1440.png new file mode 100644 index 0000000..6c42354 Binary files /dev/null and b/home/m3tam3re/wallpapers/wallhaven-k72v6q_2560x1440.png differ diff --git a/home/m3tam3re/wallpapers/wallhaven-l3o7j2_2560x1440.png b/home/m3tam3re/wallpapers/wallhaven-l3o7j2_2560x1440.png new file mode 100644 index 0000000..7f3b1cb Binary files /dev/null and b/home/m3tam3re/wallpapers/wallhaven-l3o7j2_2560x1440.png differ diff --git a/home/m3tam3re/wallpapers/wallhaven-lmmo8r.jpg b/home/m3tam3re/wallpapers/wallhaven-lmmo8r.jpg new file mode 100644 index 0000000..9c37339 Binary files /dev/null and b/home/m3tam3re/wallpapers/wallhaven-lmmo8r.jpg differ