diff --git a/flake.lock b/flake.lock index a1907e5..0308a73 100644 --- a/flake.lock +++ b/flake.lock @@ -28,17 +28,38 @@ ] }, "locked": { - "lastModified": 1780229583, - "narHash": "sha256-WxokKtyJ0fRiTNIaf+Tfd05GhZVsqoTP5Q0cXiNipsI=", - "path": "/home/m3tam3re/p/NIX/agent-lib", - "type": "path" + "lastModified": 1780157040, + "narHash": "sha256-j2d3nj3FvOlxQ+Zlse+rMo3qHD3m4Gick5uiwtTaA2o=", + "ref": "refs/heads/master", + "rev": "f63712a9ba03da6e2f591766d0f055aa65e6d237", + "revCount": 24, + "type": "git", + "url": "ssh://gitea@code.m3ta.dev/m3tam3re/agent-lib" }, "original": { - "path": "/home/m3tam3re/p/NIX/agent-lib", - "type": "path" + "type": "git", + "url": "ssh://gitea@code.m3ta.dev/m3tam3re/agent-lib" } }, "agents": { + "inputs": { + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1780133320, + "narHash": "sha256-8AiN9tV9PBb5xblJiPlhumBbKj61qLjzqXXFtkj3vvY=", + "ref": "refs/heads/master", + "rev": "920c00313ae242bd93275c30131b9ab1e52ee2fb", + "revCount": 88, + "type": "git", + "url": "ssh://gitea@code.m3ta.dev/m3tam3re/AGENTS" + }, + "original": { + "type": "git", + "url": "ssh://gitea@code.m3ta.dev/m3tam3re/AGENTS" + } + }, + "agents_2": { "flake": false, "locked": { "lastModified": 1778518220, @@ -114,6 +135,28 @@ "type": "github" } }, + "dms": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ], + "quickshell": "quickshell" + }, + "locked": { + "lastModified": 1777431599, + "narHash": "sha256-g6r/Gx8PTDzO3jCNzzySA+Ff1lmLF9nDlMCNyyoQjoE=", + "owner": "AvengeMedia", + "repo": "DankMaterialShell", + "rev": "eb5afcdc40ea5446c27e18552ff4a19f9daf9484", + "type": "github" + }, + "original": { + "owner": "AvengeMedia", + "ref": "stable", + "repo": "DankMaterialShell", + "type": "github" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -178,7 +221,7 @@ }, "m3ta-nixpkgs": { "inputs": { - "agents": "agents", + "agents": "agents_2", "basecamp": "basecamp", "nixpkgs": [ "nixpkgs" @@ -267,6 +310,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1772479524, + "narHash": "sha256-u7nCaNiMjqvKpE+uZz9hE7pgXXTmm5yvdtFaqzSzUQI=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "4215e62dc2cd3bc705b0a423b9719ff6be378a43", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1779560665, "narHash": "sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o=", @@ -282,7 +341,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1779560665, "narHash": "sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o=", @@ -301,14 +360,14 @@ "nur": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1780228894, - "narHash": "sha256-7u/krCQx3loaM+kNi5i4N5ZGprILDed8JOl6wFrDEqI=", + "lastModified": 1780290189, + "narHash": "sha256-2igu6l2/d4RikYmC/SsykZ1jF1e4+Df+2qWPYjq2xto=", "owner": "nix-community", "repo": "NUR", - "rev": "e9c97d6945177c6d9cea9e5b2f78bcbfdc3f56d2", + "rev": "8b6210602dcbd4409ab1c3453ea0c292637c2799", "type": "github" }, "original": { @@ -338,14 +397,38 @@ "type": "github" } }, + "quickshell": { + "inputs": { + "nixpkgs": [ + "dms", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1776854048, + "narHash": "sha256-lLbV66V3RMNp1l8/UelmR4YzoJ5ONtgvEtiUMJATH/o=", + "ref": "refs/heads/master", + "rev": "783c953987dc56ff0601abe6845ed96f1d00495a", + "revCount": 806, + "type": "git", + "url": "https://git.outfoxxed.me/quickshell/quickshell" + }, + "original": { + "rev": "783c953987dc56ff0601abe6845ed96f1d00495a", + "type": "git", + "url": "https://git.outfoxxed.me/quickshell/quickshell" + } + }, "root": { "inputs": { "agenix": "agenix", "agent-lib": "agent-lib", + "agents": "agents", + "dms": "dms", "home-manager": "home-manager_2", "m3ta-nixpkgs": "m3ta-nixpkgs", "nix-colors": "nix-colors", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "nur": "nur" } }, diff --git a/flake.nix b/flake.nix index 27aeaa6..dd4b4b3 100644 --- a/flake.nix +++ b/flake.nix @@ -16,8 +16,19 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + agents = { + # url = "path:/home/m3tam3re/p/AI/AGENTS"; + url = "git+ssh://gitea@code.m3ta.dev/m3tam3re/AGENTS"; + }; + agent-lib = { - url = "path:/home/m3tam3re/p/NIX/agent-lib"; + # url = "path:/home/m3tam3re/p/NIX/agent-lib"; + url = "git+ssh://gitea@code.m3ta.dev/m3tam3re/agent-lib"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + + dms = { + url = "github:AvengeMedia/DankMaterialShell/stable"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/modules/default.nix b/modules/default.nix index 68e006f..c14900a 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -15,7 +15,6 @@ in { imports = [ # External modules inputs.agent-lib.homeManagerModules.default - # Paths — must be first, provides "m3ta-home".paths.srcRoot ./paths.nix diff --git a/profiles/contexts/desktop/default.nix b/profiles/contexts/desktop/default.nix index 540d7f5..9dcdf07 100644 --- a/profiles/contexts/desktop/default.nix +++ b/profiles/contexts/desktop/default.nix @@ -2,6 +2,7 @@ # Includes window manager, applications, theming, and desktop session config. { config, + inputs, pkgs, ... }: { @@ -64,29 +65,30 @@ settings = { font-family = "Fira Code"; copy-on-select = "clipboard"; - foreground = "#${config.colorScheme.palette.base05}"; - background = "#${config.colorScheme.palette.base00}"; - selection-foreground = "#${config.colorScheme.palette.base07}"; - selection-background = "#${config.colorScheme.palette.base02}"; - cursor-color = "#${config.colorScheme.palette.base05}"; - palette = [ - "0=#${config.colorScheme.palette.base01}" - "1=#${config.colorScheme.palette.base08}" - "2=#${config.colorScheme.palette.base0B}" - "3=#${config.colorScheme.palette.base0A}" - "4=#${config.colorScheme.palette.base0D}" - "5=#${config.colorScheme.palette.base0E}" - "6=#${config.colorScheme.palette.base0C}" - "7=#${config.colorScheme.palette.base05}" - "8=#${config.colorScheme.palette.base03}" - "9=#${config.colorScheme.palette.base08}" - "10=#${config.colorScheme.palette.base0B}" - "11=#${config.colorScheme.palette.base0A}" - "12=#${config.colorScheme.palette.base0D}" - "13=#${config.colorScheme.palette.base0E}" - "14=#${config.colorScheme.palette.base0C}" - "15=#${config.colorScheme.palette.base07}" - ]; + theme = "dankcolors"; + # foreground = "#${config.colorScheme.palette.base05}"; + # background = "#${config.colorScheme.palette.base00}"; + # selection-foreground = "#${config.colorScheme.palette.base07}"; + # selection-background = "#${config.colorScheme.palette.base02}"; + # cursor-color = "#${config.colorScheme.palette.base05}"; + # palette = [ + # "0=#${config.colorScheme.palette.base01}" + # "1=#${config.colorScheme.palette.base08}" + # "2=#${config.colorScheme.palette.base0B}" + # "3=#${config.colorScheme.palette.base0A}" + # "4=#${config.colorScheme.palette.base0D}" + # "5=#${config.colorScheme.palette.base0E}" + # "6=#${config.colorScheme.palette.base0C}" + # "7=#${config.colorScheme.palette.base05}" + # "8=#${config.colorScheme.palette.base03}" + # "9=#${config.colorScheme.palette.base08}" + # "10=#${config.colorScheme.palette.base0B}" + # "11=#${config.colorScheme.palette.base0A}" + # "12=#${config.colorScheme.palette.base0D}" + # "13=#${config.colorScheme.palette.base0E}" + # "14=#${config.colorScheme.palette.base0C}" + # "15=#${config.colorScheme.palette.base07}" + # ]; }; }; @@ -100,18 +102,18 @@ home.packages = with pkgs; [ appimage-run bemoji - eigent + dconf (element-desktop.override { commandLineArgs = "--password-store=gnome-libsecret"; }) launch-webapp file-roller - hyprpanel - hyprpaper-random + gsettings-desktop-schemas seahorse sushi ksnip nwg-look + qt6Packages.qt6ct rose-pine-hyprcursor remmina slack diff --git a/profiles/contexts/desktop/theme/theme.nix b/profiles/contexts/desktop/theme/theme.nix index c78c598..7cc01df 100644 --- a/profiles/contexts/desktop/theme/theme.nix +++ b/profiles/contexts/desktop/theme/theme.nix @@ -11,13 +11,14 @@ gtk = { enable = true; + colorScheme = "dark"; theme = { - name = "Dracula"; - package = pkgs.dracula-theme; + name = "Adwaita"; + package = pkgs.adw-gtk3; }; iconTheme = { - name = "Dracula"; - package = pkgs.dracula-icon-theme; + name = "Papirus"; + package = pkgs.papirus-icon-theme; }; gtk4.theme = config.gtk.theme; }; diff --git a/profiles/contexts/desktop/wm/hyprland.nix b/profiles/contexts/desktop/wm/hyprland.nix index b0c7832..d325e4d 100644 --- a/profiles/contexts/desktop/wm/hyprland.nix +++ b/profiles/contexts/desktop/wm/hyprland.nix @@ -16,12 +16,12 @@ in { xwayland = { force_zero_scaling = true; }; - + source = [ + "~/.config/hypr/dms/colors.conf" + "~/.config/hypr/dms/layout.conf" + "~/.config/hypr/monitors.conf" + ]; exec-once = [ - "hyprpanel" - "while ! hyprpaper-random; do sleep 0.5; done" - "wl-paste --type text --watch cliphist store" - "wl-paste --type image --watch cliphist store" "vibetyper" ]; @@ -35,6 +35,9 @@ in { "XDG_SESSION_DESKTOP,Hyprland" "XKB_DEFAULT_LAYOUT,de" "NIXOS_OZONE_WL,1" + "QT_QPA_PLATFORM,wayland;xcb" + "QT_QPA_PLATFORMTHEME,gtk3" + "QT_QPA_PLATFORMTHEME_QT6,gtk3" ]; input = { @@ -50,8 +53,6 @@ in { gaps_in = 5; gaps_out = 5; border_size = 1; - "col.active_border" = "rgba(9742b5ee) rgba(9742b5ee) 45deg"; - "col.inactive_border" = "rgba(${config.colorScheme.palette.base03}aa)"; layout = "dwindle"; }; @@ -60,7 +61,7 @@ in { enabled = true; range = 60; render_power = 3; - color = "rgba(${config.colorScheme.palette.base00}66)"; + # color = "rgba(${config.colorScheme.palette.base00}66)"; offset = "1 2"; scale = 0.97; }; @@ -97,10 +98,6 @@ in { }; device = [ - { - name = "epic-mouse-v1"; - sensitivity = -0.5; - } { name = "zsa-technology-labs-moonlander-mark-i"; kb_layout = "us"; @@ -166,14 +163,14 @@ in { "$mainMod, r, exec, hyprctl dispatch focuswindow \"initialtitle:.*alert-box.*\" && hyprctl dispatch moveactive exact 4300 102 && hyprctl dispatch focuswindow \"initialtitle:.*chat-box.*\" && hyprctl dispatch moveactive exact 4300 512" "$mainMod, b, exec, uwsm app -- thunar" "$mainMod SHIFT, B, exec, uwsm app -- vivaldi" - "$mainMod, Escape, exec, uwsm app -- wlogout -p layer-shell" - "$mainMod, Space, togglefloating" + "$mainMod, Escape, exec, uwsm app -- dms ipc call powermenu toggle" + # "$mainMod, Space, togglefloating" "$mainMod, q, killactive" "$mainMod, M, exit" "$mainMod, F, fullscreen" "$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, D, exec, uwsm app -- dms ipc call spotlight toggle" + "$mainMod, V, exec, uwsm app -- dms ipc call clipboard toggle" "$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" @@ -210,8 +207,6 @@ in { ]; bindr = [ - "$mainMod, R, exec, stt-ptt stop" - "$mainMod, S, exec, stt-ptt format-stop" ]; bindm = [ @@ -221,99 +216,99 @@ in { }; }; - services.hypridle = { - enable = true; - settings = { - general = { - before_sleep_cmd = "hyprlock"; - after_sleep_cmd = "hyprctl dispatch dpms on"; - inhibit_sleep = 3; - }; - listener = [ - { - timeout = 300; - on-timeout = "hyprlock"; - } - { - timeout = 420; - on-timeout = "hyprctl dispatch dpms off"; - on-resume = "hyprctl dispatch dpms on"; - } - ]; - }; - }; + # services.hypridle = { + # enable = true; + # settings = { + # general = { + # before_sleep_cmd = "hyprlock"; + # after_sleep_cmd = "hyprctl dispatch dpms on"; + # inhibit_sleep = 3; + # }; + # listener = [ + # { + # timeout = 300; + # on-timeout = "hyprlock"; + # } + # { + # timeout = 420; + # on-timeout = "hyprctl dispatch dpms off"; + # on-resume = "hyprctl dispatch dpms on"; + # } + # ]; + # }; + # }; - services.hyprpaper.enable = true; + # 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})"; + # 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; - }; + # 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})"; - }; + # 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"; - } - ]; + # 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"; - } - ]; - }; - }; + # 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"; + # } + # ]; + # }; + # }; }; }