From 0edd66d61a82b10e9ec3fccf0ce9db4f0bca0836 Mon Sep 17 00:00:00 2001 From: mrfluffy Date: Thu, 15 Jan 2026 16:48:40 +0000 Subject: [PATCH] Giving claude access diving in balls first --- "dots/\\" | 423 -------------------------- dots/hyprland.nix | 88 +++--- dots/xdg.nix | 2 +- flake.nix | 1 - "home/\\" | 303 ------------------ home/homePkgs.nix | 7 +- home/stylix.nix | 2 +- home/work.nix | 1 - system/nixOSPkgs.nix | 4 +- system/services.nix | 2 +- system/specialisation/main-system.nix | 24 +- 11 files changed, 68 insertions(+), 789 deletions(-) delete mode 100644 "dots/\\" delete mode 100644 "home/\\" diff --git "a/dots/\\" "b/dots/\\" deleted file mode 100644 index 34be107..0000000 --- "a/dots/\\" +++ /dev/null @@ -1,423 +0,0 @@ -{ - config, - lib, - pkgs, - window_manager, - systemName, - inputs, - ... -}: -let - hypr-package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland; - hypr-portal = - inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland; - hypr-split = - inputs.hyprland-hyprsplit.packages.${pkgs.stdenv.hostPlatform.system}.split-monitor-workspaces; - #hyprscrolling = inputs.hyprland-plugins.packages.${pkgs.stdenv.hostPlatform.system}.hyprscrolling; - mod = "Alt"; - terminal = "footclient"; - fileManager = "thunar"; - #runner = "${lib.getExe caelestia-cli} shell drawers toggle launcher"; - runner = "vicinae toggle"; - # runner = "anyrun"; - browser = "brave"; - editor = "emacsclient -c"; -in -{ - wayland.windowManager.hyprland = { - enable = window_manager == "hyprland" || window_manager == "all"; - package = hypr-package; - portalPackage = hypr-portal; - plugins = [ - #pkgs.hyprlandPlugins.hyprsplit - hypr-split - #hyprscrolling - ]; - - settings = { - ########################################################################## - # Monitors - ########################################################################## - #source = "./dms/outputs.conf"; - - # See https://wiki.hyprland.org/Configuring/Monitors/ - monitor = lib.mkMerge [ - #(lib.mkIf (systemName == "laptop") [ "eDP-1,1920x1080@59.99700,0x0,1" ]) - (lib.mkIf (systemName == "pc") [ - "HDMI-A-2, disable" - ]) - ]; - - monitorv2 = - [ ] - ++ lib.optional (systemName == "laptop") { - output = "eDP-1"; - mode = "1920x1080@59.99700"; - scale = 1; - position = "0x0"; - } - ++ lib.optional (systemName == "pc") { - output = "DP-1"; - mode = "2560x1440@239.97"; - position = "2560x0"; # "1440x750"; # Corrected from 2569x0 for seamless alignment - scale = 1; - #supports_wide_color = 1; - bitdepth = 10; - cm = "wide"; - supports_hdr = true; - supports_wide_color = true; - sdr_min_luminance = 0; # For true black on OLED - sdr_max_luminance = 275; # Matches typical SDR brightness - min_luminance = 0; - max_luminance = 1000; # HDR peak - max_avg_luminance = 400; # Average frame luminance - sdrbrightness = 1.2; # Slight boost to avoid washed out look - sdrsaturation = 1.0; - } - ++ lib.optional (systemName == "pc") { - output = "DP-2"; - mode = "2560x1440@144"; - scale = 1; - position = "0x0"; - transform = 0; - }; - - ########################################################################## - # Autostart - ########################################################################## - - # Autostart necessary processes (like notifications daemons, status bars, etc.) - # Or execute your favorite apps at launch like this: - exec-once = [ - # "waybar" - # "quickshell" - #"${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1" - "${pkgs.kdePackages.polkit-kde-agent-1}/libexec/polkit-kde-authentication-agent-1" - "${pkgs.kdePackages.kwallet-pam}/libexec/pam_kwallet_init" - "fcitx5 -d" - "foot -s" - "systemctl --user import-environment DBUS_SESSION_BUS_ADDRESS WAYLAND_DISPLAY XDG_SESSION_TYPE XDG_CURRENT_DESKTOP XDG_SESSION_DESKTOP QT_QPA_PLATFORMTHEME GTK_THEME" - "dbus-update-activation-environment --systemd --all" - ] - ++ lib.optionals (config.home.username == "work") [ - "thunderbird" - "sleep 10 && emacsclient -c --frame-parameters='((name . \"work\"))' $HOME/Documents/work/README.org" - ]; - # ++ lib.optional (systemName == "laptop") - # "swaybg -o eDP-1 -i ${../assets/Wallpapers/138.png}" - # - # ++ lib.optional (systemName == "pc") - # "swaybg -o HDMI-A-1 -i ${../assets/Wallpapers/138.png} -o DP-1 -i ${../assets/Wallpapers/138.png}"; - - ########################################################################## - # Plugins - ########################################################################## - - plugin = { - split-monitor-workspaces = { - count = 10; - penable_persistent_workspaces = 1; - }; - hyprscrolling = { - column_width = 0.9; - follow_focus = false; - fullscreen_on_one_column = true; - }; - }; - - ########################################################################## - # Environment - ########################################################################## - - env = [ - "XCURSOR_SIZE, 24" - "HYPRCURSOR_SIZE, 24" - ]; - - ########################################################################## - # General / Render / Decoration / Animations - ########################################################################## - - # https://wiki.hyprland.org/Configuring/Variables/ - # https://wiki.hyprland.org/Configuring/Variables/#general - general = { - gaps_in = 5; - gaps_out = 10; - border_size = 2; - # "col.active_border" = "rgba(33ccffee) rgba(00ff99ee) 45deg"; - # "col.inactive_border" = "rgba(595959aa)"; - resize_on_border = false; # enable resizing windows by clicking and dragging on borders and gaps - allow_tearing = false; # see https://wiki.hyprland.org/Configuring/Tearing/ before enabling - layout = "master"; - }; - - render = { - cm_enabled = true; # turn on the CM pipeline (requires Hyprland restart) - cm_fs_passthrough = 2; # passthrough only for HDR content (safer than 1) - cm_auto_hdr = 1; # auto-switch monitor to HDR for fullscreen apps - send_content_type = true; # helps auto HDR on some displays - # cm_fs_passthrough = 1; # optional: keep your existing line; you can replace with 2 as above - }; - - # https://wiki.hyprland.org/Configuring/Variables/#decoration - decoration = { - rounding = 0; - rounding_power = 0; - active_opacity = 1.0; - inactive_opacity = 1.0; - - shadow = { - enabled = true; - range = 4; - render_power = 3; - # color = "rgba(1a1a1aee)"; - }; - - # https://wiki.hyprland.org/Configuring/Variables/#blur - blur = { - enabled = false; - size = 3; - passes = 1; - vibrancy = 0.1696; - }; - }; - - animations = { - enabled = "yes, please :)"; - - # Default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more - bezier = [ - "easeOutQuint,0.23,1,0.32,1" - "easeInOutCubic,0.65,0.05,0.36,1" - "linear,0,0,1,1" - "almostLinear,0.5,0.5,0.75,1.0" - "quick,0.15,0,0.1,1" - ]; - - animation = [ - "global, 1, 10, default" - "border, 1, 5.39, easeOutQuint" - "windows, 1, 4.79, easeOutQuint" - "windowsIn, 1, 4.1, easeOutQuint, popin 87%" - "windowsOut, 1, 1.49, linear, popin 87%" - "fadeIn, 1, 1.73, almostLinear" - "fadeOut, 1, 1.46, almostLinear" - "fade, 1, 3.03, quick" - "layers, 1, 3.81, easeOutQuint" - "layersIn, 1, 4, easeOutQuint, fade" - "layersOut, 1, 1.5, linear, fade" - "fadeLayersIn, 1, 1.79, almostLinear" - "fadeLayersOut, 1, 1.39, almostLinear" - "workspaces, 1, 1.94, almostLinear, fade" - "workspacesIn, 1, 1.21, almostLinear, fade" - "workspacesOut, 1, 1.94, almostLinear, fade" - ]; - }; - - ########################################################################## - # Layouts - ########################################################################## - - # See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more - dwindle = { - pseudotile = true; # Master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds - preserve_split = true; # You probably want this - force_split = 2; - }; - - # See https://wiki.hyprland.org/Configuring/Master-Layout/ for more - master = { - new_status = "master"; - mfact = 0.5; - new_on_top = true; - }; - - ########################################################################## - # Misc / Input / Gestures / Devices - ########################################################################## - - # https://wiki.hyprland.org/Configuring/Variables/#misc - misc = { - force_default_wallpaper = -1; # Set to 0 or 1 to disable the anime mascot wallpapers - disable_hyprland_logo = true; # If true disables the random hyprland logo / anime girl background. :( - enable_swallow = true; - swallow_regex = "footclient"; - }; - - # https://wiki.hyprland.org/Configuring/Variables/#input - input = { - kb_layout = lib.mkMerge [ - (lib.mkIf (systemName == "laptop") "ie") - (lib.mkIf (systemName == "pc") "us") - ]; - repeat_rate = 40; - repeat_delay = 500; - # kb_variant = - # kb_model = - # kb_options = - # kb_rules = - follow_mouse = 1; - sensitivity = 0; # -1.0 - 1.0, 0 means no modification. - - touchpad = { - natural_scroll = false; - }; - }; - - # https://wiki.hyprland.org/Configuring/Variables/#gestures - # gestures = { - # workspace_swipe = true; - # workspace_swipe_cancel_ratio = 0.15; - # }; - - # Example per-device config - # See https://wiki.hyprland.org/Configuring/Keywords/#per-device-input-configs - device = { - name = "epic-mouse-v1"; - sensitivity = -0.5; - }; - - ########################################################################## - # Binds - ########################################################################## - - bind = [ - # Launcher / apps - "${mod}, Return, exec, ${terminal}" - "${mod}, B, exec, ${browser}" - "${mod}, F, exec, ${fileManager}" - "${mod}, D, exec, ${runner}" - "${mod}, E, exec, ${editor}" - - # Session / window controls - "${mod}, Q, killactive," - "${mod}, M, exit," - "${mod}, V, togglefloating," - "${mod}, T, fullscreen" - # ",Print, exec, grim -g \"$(slurp)\" - | swappy -f -" - ",Print, exec, dms screenshot" - "${mod}, f1, exec, dms ipc call keybinds toggle hyprland" - - # Dwindle - "${mod}, P, pseudo, " - - # Focus (arrows) - "${mod}, H, movefocus, l" - "${mod}, L, movefocus, r" - "${mod}, K, movefocus, u" - "${mod}, J, movefocus, d" - - # Column movement (hyprscrolling) - #"${mod}, h, layoutmsg, move -col" - #"${mod}, L, layoutmsg, move +col" - - # Move window - "${mod} SHIFT, H, movewindow, l" - "${mod} SHIFT, L, movewindow, r" - "${mod} SHIFT, K, movewindow, u" - "${mod} SHIFT, J, movewindow, d" - #"${mod} SHIFT, L, layoutmsg, movewindowto r" - #"${mod} SHIFT, H, layoutmsg, movewindowto l" - #"${mod} SHIFT, K, layoutmsg, movewindowto u" - #"${mod} SHIFT, J, layoutmsg, movewindowto d" - "${mod}, semicolon, layoutmsg, promote" - - #hyperscrolling stuff - "${mod}, period, layoutmsg, move +col" - "${mod}, comma, layoutmsg, move -col" - - # Workspaces (switch) - "${mod}, 1, split-workspace, 1 " - "${mod}, 2, split-workspace, 2 " - "${mod}, 3, split-workspace, 3 " - "${mod}, 4, split-workspace, 4 " - "${mod}, 5, split-workspace, 5 " - "${mod}, 6, split-workspace, 6 " - "${mod}, 7, split-workspace, 7 " - "${mod}, 8, split-workspace, 8 " - "${mod}, 9, split-workspace, 9 " - "${mod}, 0, split-workspace, 10" - - # Workspaces (move active window) - "${mod} SHIFT, 1, split-movetoworkspacesilent, 1 " - "${mod} SHIFT, 2, split-movetoworkspacesilent, 2 " - "${mod} SHIFT, 3, split-movetoworkspacesilent, 3 " - "${mod} SHIFT, 4, split-movetoworkspacesilent, 4 " - "${mod} SHIFT, 5, split-movetoworkspacesilent, 5 " - "${mod} SHIFT, 6, split-movetoworkspacesilent, 6 " - "${mod} SHIFT, 7, split-movetoworkspacesilent, 7 " - "${mod} SHIFT, 8, split-movetoworkspacesilent, 8 " - "${mod} SHIFT, 9, split-movetoworkspacesilent, 9 " - "${mod} SHIFT, 0, split-movetoworkspacesilent, 10" - - # Special workspace (scratchpad) - "${mod}, SLASH, togglespecialworkspace, magic" - "${mod} SHIFT, SLASH, movetoworkspace, special:magic" - - # Scroll through existing workspaces with mainMod + scroll - "${mod}, mouse_down, workspace, e+1" - "${mod}, mouse_up, workspace, e-1" - - # 8BitDo keyboard big red b Button - "${mod} SHIFT, F1, exec, scrcpy --video-source=camera -m3000 --camera-facing=back --v4l2-sink=/dev/video1 --no-video-playback --no-audio" - ]; - - bindm = [ - # Move/resize windows with mainMod + LMB/RMB and dragging - "${mod}, mouse:272, movewindow" - "${mod}, mouse:273, resizewindow" - ]; - - bindel = [ - ",XF86AudioRaiseVolume, exec, pamixer -i 5" - ",XF86AudioLowerVolume, exec, pamixer -d 5" - ",XF86AudioMute, exec, pamixer --toggle-mute" - ",XF86AudioMicMute, exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle" - # ",XF86MonBrightnessUp, exec, light -A 5" - # ",XF86MonBrightnessDown, exec, light -U 5" - - # Brightness - ",XF86MonBrightnessUp, global, dms ipc call brightness increment 5" - ",XF86MonBrightnessDown, global, dms ipc call brightness decrement 5" - ]; - - bindl = [ - ", XF86AudioNext, exec, playerctl next" - ", XF86AudioPause, exec, playerctl play-pause" - ", XF86AudioPlay, exec, playerctl play-pause " - ", XF86AudioPrev, exec, playerctl previous " - ]; - - binds = [ ]; - - ########################################################################## - # Rules (windows / workspaces) - ########################################################################## - - # See https://wiki.hyprland.org/Configuring/Window-Rules/ for more - # See https://wiki.hyprland.org/Configuring/Workspace-Rules/ for workspace rules - - # Example windowrule - # windowrule = float,class:^(kitty)$,title:^(kitty)$ - - # Smart gaps / No gaps when only - # workspace = w[tv1], gapsout:0, gapsin:0 - # workspace = f[1], gapsout:0, gapsin:0 - # windowrule = bordersize 0, floating:0, onworkspace:w[tv1] - # windowrule = rounding 0, floating:0, onworkspace:w[tv1] - # windowrule = bordersize 0, floating:0, onworkspace:f[1] - # windowrule = rounding 0, floating:0, onworkspace:f[1] - - windowrule = [ - # Ignore maximize requests from apps. You'll probably like this. - "match:class .*, suppress_event maximize" - - # Fix some dragging issues with XWayland - "match:class ^$, match:title ^$, match:xwayland 1, match:float 1, match:fullscreen 0, match:pin 0, no_focus on" - - "match:class thunderbird, workspace special:magic silent" - "match:class emacs, match:title work, workspace special:magic silent" - ]; - }; - }; -} diff --git a/dots/hyprland.nix b/dots/hyprland.nix index 34be107..0436c7a 100755 --- a/dots/hyprland.nix +++ b/dots/hyprland.nix @@ -20,7 +20,7 @@ let #runner = "${lib.getExe caelestia-cli} shell drawers toggle launcher"; runner = "vicinae toggle"; # runner = "anyrun"; - browser = "brave"; + browser = "firefox"; editor = "emacsclient -c"; in { @@ -38,49 +38,53 @@ in ########################################################################## # Monitors ########################################################################## - #source = "./dms/outputs.conf"; - - # See https://wiki.hyprland.org/Configuring/Monitors/ - monitor = lib.mkMerge [ - #(lib.mkIf (systemName == "laptop") [ "eDP-1,1920x1080@59.99700,0x0,1" ]) - (lib.mkIf (systemName == "pc") [ - "HDMI-A-2, disable" - ]) + source = [ + "./dms/outputs.conf" + #"./dms/cursor.conf" + "./dms/colors.conf" ]; - monitorv2 = - [ ] - ++ lib.optional (systemName == "laptop") { - output = "eDP-1"; - mode = "1920x1080@59.99700"; - scale = 1; - position = "0x0"; - } - ++ lib.optional (systemName == "pc") { - output = "DP-1"; - mode = "2560x1440@239.97"; - position = "2560x0"; # "1440x750"; # Corrected from 2569x0 for seamless alignment - scale = 1; - #supports_wide_color = 1; - bitdepth = 10; - cm = "wide"; - supports_hdr = true; - supports_wide_color = true; - sdr_min_luminance = 0; # For true black on OLED - sdr_max_luminance = 275; # Matches typical SDR brightness - min_luminance = 0; - max_luminance = 1000; # HDR peak - max_avg_luminance = 400; # Average frame luminance - sdrbrightness = 1.2; # Slight boost to avoid washed out look - sdrsaturation = 1.0; - } - ++ lib.optional (systemName == "pc") { - output = "DP-2"; - mode = "2560x1440@144"; - scale = 1; - position = "0x0"; - transform = 0; - }; + # See https://wiki.hyprland.org/Configuring/Monitors/ + #monitor = lib.mkMerge [ + # #(lib.mkIf (systemName == "laptop") [ "eDP-1,1920x1080@59.99700,0x0,1" ]) + # (lib.mkIf (systemName == "pc") [ + # "HDMI-A-2, disable" + # ]) + #]; + + #monitorv2 = + # [ ] + # ++ lib.optional (systemName == "laptop") { + # output = "eDP-1"; + # mode = "1920x1080@59.99700"; + # scale = 1; + # position = "0x0"; + # } + # ++ lib.optional (systemName == "pc") { + # output = "DP-1"; + # mode = "2560x1440@239.97"; + # position = "2560x0"; # "1440x750"; # Corrected from 2569x0 for seamless alignment + # scale = 1; + # #supports_wide_color = 1; + # bitdepth = 10; + # cm = "wide"; + # supports_hdr = true; + # supports_wide_color = true; + # sdr_min_luminance = 0; # For true black on OLED + # sdr_max_luminance = 275; # Matches typical SDR brightness + # min_luminance = 0; + # max_luminance = 1000; # HDR peak + # max_avg_luminance = 400; # Average frame luminance + # sdrbrightness = 1.2; # Slight boost to avoid washed out look + # sdrsaturation = 1.0; + # } + # ++ lib.optional (systemName == "pc") { + # output = "DP-2"; + # mode = "2560x1440@144"; + # scale = 1; + # position = "0x0"; + # transform = 0; + # }; ########################################################################## # Autostart diff --git a/dots/xdg.nix b/dots/xdg.nix index 8d8cf1c..a863ea0 100755 --- a/dots/xdg.nix +++ b/dots/xdg.nix @@ -38,7 +38,7 @@ defaultApplications = let - browser = [ "brave.desktop" ]; + browser = [ "firefox.desktop" ]; fileManager = [ "pcmanfm.desktop" ]; editor = [ "emacs.desktop" ]; player = [ "mpv.desktop" ]; diff --git a/flake.nix b/flake.nix index 86c60e2..9759339 100755 --- a/flake.nix +++ b/flake.nix @@ -29,7 +29,6 @@ dms = { url = "github:AvengeMedia/DankMaterialShell"; inputs.nixpkgs.follows = "nixpkgs"; - inputs.dgop.follows = "dgop"; }; caelestia.url = "github:caelestia-dots/shell"; caelestia-cli.url = "github:caelestia-dots/cli"; diff --git "a/home/\\" "b/home/\\" deleted file mode 100644 index 58bf2c0..0000000 --- "a/home/\\" +++ /dev/null @@ -1,303 +0,0 @@ -{ - config, - lib, - pkgs, - inputs, - ... -}: -let - # hyprlock = pkgs.callPackage ../../universal/personalPKGS/hyprlock.nix {}; - # hypridle = pkgs.callPackage ../../universal/personalPKGS/hypridle.nix {}; - - defaultProfile = { - id = 0; - name = "default"; - isDefault = true; - }; -in -{ - imports = [ - inputs.zen-browser.homeModules.beta - inputs.caelestia.homeManagerModules.default - inputs.vicinae.homeManagerModules.default - ]; - - programs = { - zen-browser = { - enable = true; - profiles.default = defaultProfile; - }; - - firefox = { - enable = true; - profiles.default = defaultProfile; - }; - - nix-index = { - enable = true; - enableZshIntegration = true; - }; - lazygit.enable = true; - - vscode = { - enable = true; - - # Key fix: don’t let the CLI touch ~/.vscode/extensions - mutableExtensionsDir = false; - - # (Optional but nice) Use a build with a stable headless CLI: - # package = pkgs.vscodium; # or keep pkgs.vscode - - profiles.default = { - extensions = with pkgs.vscode-extensions; [ - platformio.platformio-vscode-ide - ]; - - # Optional: keep Code from trying to self-update - # userSettings = { - # "update.mode" = "none"; - # "extensions.autoUpdate" = false; - # }; - }; - - # Optional (older HM versions expose these at top-level): - # enableUpdateCheck = false; - # enableExtensionUpdateCheck = false; - }; - - }; - - services.vicinae = { - enable = true; # default: false - systemd = { - enable = true; - environment = { - USE_LAYER_SHELL = 1; - }; - }; - #package = # specify package to use here. Can be omitted. - # Installing (vicinae) extensions declaratively - #settings = { - # faviconService = "twenty"; # twenty | google | none - # font.size = 11; - # popToRootOnClose = false; - # rootSearch.searchFiles = false; - # theme.name = "vicinae-dark"; - # window = { - # csd = true; - # opacity = 0.95; - # rounding = 10; - # }; - #}; - #extensions = [ - # (inputs.vicinae.mkVicinaeExtension.${pkgs.stdenv.hostPlatform.system} { - # inherit pkgs; - # name = "extension-name"; - # src = pkgs.fetchFromGitHub { - # # You can also specify different sources other than github - # owner = "repo-owner"; - # repo = "repo-name"; - # rev = "v1.0"; # If the extension has no releases use the latest commit hash - # # You can get the sha256 by rebuilding once and then copying the output hash from the error message - # sha256 = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="; - # }; # If the extension is in a subdirectory you can add ` + "/subdir"` between the brace and the semicolon here - # }) - #]; - }; - - qt.enable = true; - # qt.style = "gtk2"; - # qt.platformTheme = "qt5ct"; - - nixpkgs = { - config = { - allowUnfree = true; - permittedInsecurePackages = [ - "freeimage-unstable-2021-11-01" - "qtwebengine-5.15.19" - ]; - }; - }; - - services.kdeconnect.enable = true; - pkgs = import inputs.nixpkgs { - config = { - android_sdk.accept_license = true; # Accept Android SDK license - # allowUnfree = true; # Uncomment if you encounter unfree issues with android-studio-full - }; - }; - - home.packages = with pkgs; [ - ############################ - # Shells & Terminals - ############################ - alacritty - zsh - - ############################ - # CLI Shit - ############################ - atuin - - ############################ - # System Utilities - ############################ - app2unit - brightnessctl - ddcutil - duf - libnotify - lm_sensors - macchina - rm-improved - xarchiver - xdg-user-dirs - - ############################ - # Monitoring & TUI Apps - ############################ - btop - cava - - ############################ - # Wayland / Desktop Tools - ############################ - grim - hyprpaper - hyprpicker - mangohud - rofi - slurp - swappy - wf-recorder - - ############################ - # Audio / Media Tools - ############################ - openai-whisper - pamixer - playerctl - alsa-utils - - ############################ - # Browsers & Web - ############################ - brave - firefox - ladybird - wgnord - - ############################ - # Communication & Sharing - ############################ - #element-desktop - localsend - thunderbird - - ############################ - # Documents & Viewers - ############################ - libreoffice - libreoffice-fresh - zathura - - ############################ - # Media Players & Imaging - ############################ - imv - mpv - #upscaler - youtube-music - libsixel - - ############################ - # Development Toolchains - ############################ - gdb - nodejs_20 - platformio - rustc - rustup - zed-editor - android-studio-full - - # Language tooling from inputs - #inputs.qs-qml.packages.${pkgs.stdenv.hostPlatform.system}.qml-ts-mode - #inputs.qs-qml.packages.${pkgs.stdenv.hostPlatform.system}.tree-sitter-qmljs - - ############################ - # Game Dev / Engines / Creative - ############################ - blender-hip - godot_4 - freecad - - ############################ - # Emulation - ############################ - fuse - fuse-emulator - fuse3 - - ############################ - # Android Tools - ############################ - android-tools - scrcpy - - ############################ - # Gaming & Launchers - ############################ - dualsensectl - gamemode - goverlay - (pkgs.heroic.override { - extraPkgs = pkgs: [ pkgs.gamescope ]; # pulls in the real package - }) - prismlauncher - protonup-qt - wineWowPackages.stable - mangayomi - rink - protontricks - - abaddon - - ############################ - # KDE / File Management - ############################ - kdePackages.qt6ct - kdePackages.baloo # new - kdePackages.baloo-widgets # new - kdePackages.dolphin - kdePackages.ffmpegthumbs # new - kdePackages.kdegraphics-mobipocket # new - kdePackages.kdegraphics-thumbnailers # new - kdePackages.kdesdk-thumbnailers # new - kdePackages.kimageformats # new - kdePackages.kio - kdePackages.kio-extras - # kdePackages.breeze-icons - # kdePackages.dolphin-plugins - # kdePackages.kde-cli-tools - # resvg # new - adwaita-icon-theme - hicolor-icon-theme - qt6.qtsvg - - adw-gtk3 - pywalfox-native - - ############################ - # Experimental (inputs) - ############################ - #inputs.ladybird.packages."${pkgs.stdenv.hostPlatform.system}".ladybird - #inputs.hyprlauncher.packages.${pkgs.stdenv.hostPlatform.system}.default - - ############################ - # Blockchain (inputs) - ############################ - #inputs.caelestia-cli.packages.${pkgs.stdenv.hostPlatform.system}.caelestia-cli - #inputs.caelestia.packages.${pkgs.stdenv.hostPlatform.system}.caelestia-shell - ]; -} diff --git a/home/homePkgs.nix b/home/homePkgs.nix index 330f774..80dfc49 100755 --- a/home/homePkgs.nix +++ b/home/homePkgs.nix @@ -51,6 +51,7 @@ in profiles.default = { extensions = with pkgs.vscode-extensions; [ platformio.platformio-vscode-ide + ms-vscode.cpptools ]; # Optional: keep Code from trying to self-update @@ -117,6 +118,7 @@ in "freeimage-unstable-2021-11-01" "qtwebengine-5.15.19" ]; + rocmSupport = true; }; }; @@ -202,7 +204,7 @@ in imv mpv #upscaler - youtube-music + pear-desktop libsixel ############################ @@ -215,6 +217,7 @@ in rustup zed-editor android-studio-full + claude-code # Language tooling from inputs #inputs.qs-qml.packages.${pkgs.stdenv.hostPlatform.system}.qml-ts-mode #inputs.qs-qml.packages.${pkgs.stdenv.hostPlatform.system}.tree-sitter-qmljs @@ -222,7 +225,7 @@ in ############################ # Game Dev / Engines / Creative ############################ - blender-hip + blender godot_4 freecad diff --git a/home/stylix.nix b/home/stylix.nix index f6fe522..8219b0e 100755 --- a/home/stylix.nix +++ b/home/stylix.nix @@ -32,7 +32,7 @@ in lazygit.enable = true; #foot.enable = true; river.enable = true; - hyprland.enable = true; + #hyprland.enable = true; waybar.enable = true; nixcord.enable = true; diff --git a/home/work.nix b/home/work.nix index 4a7f758..6ed049f 100755 --- a/home/work.nix +++ b/home/work.nix @@ -69,7 +69,6 @@ in ############################ # Browsers ############################ - brave ############################ # work stuff diff --git a/system/nixOSPkgs.nix b/system/nixOSPkgs.nix index 65c8743..41e205d 100755 --- a/system/nixOSPkgs.nix +++ b/system/nixOSPkgs.nix @@ -150,7 +150,7 @@ in }; thunar = { enable = true; - plugins = with pkgs.xfce; [ + plugins = with pkgs; [ thunar-archive-plugin thunar-volman ]; @@ -181,7 +181,7 @@ in # --- Nix tooling --- nil - nixfmt-rfc-style + nixfmt inputs.nix-alien.packages.${pkgs.stdenv.hostPlatform.system}.nix-alien # --- Wayland / Desktop --- diff --git a/system/services.nix b/system/services.nix index 0268e35..1ee7983 100755 --- a/system/services.nix +++ b/system/services.nix @@ -243,7 +243,7 @@ pkgs.platformio-core pkgs.platformio pkgs.openocd - pkgs.brave + #pkgs.brave ]; # services.udev.extraRules = '' diff --git a/system/specialisation/main-system.nix b/system/specialisation/main-system.nix index 57ad202..3b94969 100644 --- a/system/specialisation/main-system.nix +++ b/system/specialisation/main-system.nix @@ -20,20 +20,20 @@ in { # greetd + tuigreet - #services.greetd = { - # enable = true; - # restart = true; - # useTextGreeter = true; - # settings.default_session = { - # command = "${lib.getExe pkgs.tuigreet} --window-padding 1 --time --time-format '%R - %F' --remember --remember-session --asterisks"; - # user = "greeter"; - # }; - #}; - services.displayManager.dms-greeter = { + services.greetd = { enable = true; - compositor.name = "hyprland"; # Or "hyprland" or "sway" - configHome = "${config.users.users.mrfluffy.home}"; + restart = true; + useTextGreeter = true; + settings.default_session = { + command = "${lib.getExe pkgs.tuigreet} --window-padding 1 --time --time-format '%R - %F' --remember --remember-session --asterisks"; + user = "greeter"; + }; }; + #services.displayManager.dms-greeter = { + # enable = true; + # compositor.name = "hyprland"; # Or "hyprland" or "sway" + # configHome = "${config.users.users.mrfluffy.home}"; + #}; #services.displayManager.cosmic-greeter.enable = true; ##############################################################################