From 873e9fd4e73d5703040e8bc5b300b9a7ecc79c38 Mon Sep 17 00:00:00 2001 From: GarandPLG Date: Fri, 17 Oct 2025 01:20:53 +0200 Subject: [PATCH] Update system packages and home configuration --- flake.lock | 24 ++-- modules/core/packages/clients.nix | 7 -- modules/core/packages/development.nix | 2 - modules/core/packages/gaming.nix | 4 - modules/core/packages/programs.nix | 1 - modules/core/packages/tools.nix | 2 +- modules/core/packages/virtualization.nix | 1 - modules/core/starfish.nix | 74 ------------ modules/core/steam.nix | 18 ++- modules/home/anki.nix | 7 ++ modules/home/cava.nix | 3 +- modules/home/chromium.nix | 37 ++++++ modules/home/default.nix | 10 +- modules/home/hyprland/binds.nix | 3 +- modules/home/kdeConnect.nix | 8 ++ modules/home/lazygit.nix | 35 ------ modules/home/lutris.nix | 11 ++ modules/home/nextcloud.nix | 8 ++ modules/home/onlyoffice.nix | 13 ++ modules/home/scripts/keybinds.nix | 13 +- modules/home/stylix.nix | 2 +- modules/home/vesktop.nix | 3 + modules/home/xdg.nix | 21 +++- modules/home/zed.nix | 145 +++++++---------------- 24 files changed, 189 insertions(+), 263 deletions(-) delete mode 100644 modules/core/starfish.nix create mode 100644 modules/home/anki.nix create mode 100644 modules/home/chromium.nix create mode 100644 modules/home/kdeConnect.nix delete mode 100644 modules/home/lazygit.nix create mode 100644 modules/home/lutris.nix create mode 100644 modules/home/nextcloud.nix create mode 100644 modules/home/onlyoffice.nix create mode 100644 modules/home/vesktop.nix diff --git a/flake.lock b/flake.lock index 685e231..3fc5036 100644 --- a/flake.lock +++ b/flake.lock @@ -96,11 +96,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1760328219, - "narHash": "sha256-4l8Y6X30p2i0Bql+BaBSoKYj0D16JnVgUWVgNUN2jEc=", + "lastModified": 1760587417, + "narHash": "sha256-zoEJAw7naU8QZiH4x4JN/lgUgdA4H2Stk1N2KgWA1TI=", "owner": "rycee", "repo": "nur-expressions", - "rev": "cffa2e20e30efdd267a0b44c2f4e81c58f22648f", + "rev": "b37dfe9a29574b11182dac6b9b2bdb6b55948520", "type": "gitlab" }, "original": { @@ -186,11 +186,11 @@ ] }, "locked": { - "lastModified": 1760312644, - "narHash": "sha256-U9SkK45314urw9P7MmjhEgiQwwD/BTj+T3HTuz1JU1Q=", + "lastModified": 1760641408, + "narHash": "sha256-Y086n2U0kN9HjOo+UScwQDS27gKMiIlT6vDehvlmdAg=", "owner": "nix-community", "repo": "home-manager", - "rev": "e121f3773fa596ecaba5b22e518936a632d72a90", + "rev": "847669dabf374d32a072bdab3f08cae7296ac011", "type": "github" }, "original": { @@ -234,11 +234,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1760284886, - "narHash": "sha256-TK9Kr0BYBQ/1P5kAsnNQhmWWKgmZXwUQr4ZMjCzWf2c=", + "lastModified": 1760524057, + "narHash": "sha256-EVAqOteLBFmd7pKkb0+FIUyzTF61VKi7YmvP1tw4nEw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "cf3f5c4def3c7b5f1fc012b3d839575dbe552d43", + "rev": "544961dfcce86422ba200ed9a0b00dd4b1486ec5", "type": "github" }, "original": { @@ -325,11 +325,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1760350849, - "narHash": "sha256-JqcM5Pkm5q1c9D5zpINJsN1yCB4Vq1cL12ZuFyo32T4=", + "lastModified": 1760472212, + "narHash": "sha256-4C3I/ssFsq8EgaUmZP0xv5V7RV0oCHgL/Rx+MUkuE+E=", "owner": "danth", "repo": "stylix", - "rev": "7b4957d716f4fb615bf0e37d3b23c112579b1408", + "rev": "8d008296a1b3be9b57ad570f7acea00dd2fc92db", "type": "github" }, "original": { diff --git a/modules/core/packages/clients.nix b/modules/core/packages/clients.nix index 91dd214..34b6310 100644 --- a/modules/core/packages/clients.nix +++ b/modules/core/packages/clients.nix @@ -2,20 +2,13 @@ { environment.systemPackages = with pkgs; [ # Communication - discord slack mattermost-desktop # Productivity & Office bitwarden-desktop tutanota-desktop - anki-bin - onlyoffice-bin iotas logseq - # Cloud - nextcloud-client - # Browsers - ungoogled-chromium # Utilities galculator gedit diff --git a/modules/core/packages/development.nix b/modules/core/packages/development.nix index 11551d2..7f7adc4 100644 --- a/modules/core/packages/development.nix +++ b/modules/core/packages/development.nix @@ -5,8 +5,6 @@ nixd nil nixfmt-rfc-style - # Editors & IDEs - zed-editor # Learning & practice exercism ]; diff --git a/modules/core/packages/gaming.nix b/modules/core/packages/gaming.nix index c3e67a1..fb65545 100644 --- a/modules/core/packages/gaming.nix +++ b/modules/core/packages/gaming.nix @@ -6,11 +6,7 @@ }: { environment.systemPackages = with pkgs; [ - # Gaming platforms - lutris - wineWowPackages.waylandFull inputs.prismlauncher-cracked.packages.${system}.default - # Games space-cadet-pinball tty-solitaire ]; diff --git a/modules/core/packages/programs.nix b/modules/core/packages/programs.nix index fb09a32..d8d9590 100644 --- a/modules/core/packages/programs.nix +++ b/modules/core/packages/programs.nix @@ -18,6 +18,5 @@ enable = true; enableSSHSupport = true; }; - kdeconnect.enable = true; }; } diff --git a/modules/core/packages/tools.nix b/modules/core/packages/tools.nix index 12bc8ce..0352696 100644 --- a/modules/core/packages/tools.nix +++ b/modules/core/packages/tools.nix @@ -41,7 +41,7 @@ appimage-run libnotify v4l-utils - # kronometer + tasktimer # Language dicts for Iotas hunspell hunspellDicts.pl_PL diff --git a/modules/core/packages/virtualization.nix b/modules/core/packages/virtualization.nix index ada842a..19aa24d 100644 --- a/modules/core/packages/virtualization.nix +++ b/modules/core/packages/virtualization.nix @@ -4,7 +4,6 @@ virt-viewer lazydocker docker-client - docker-compose distrobox ]; } diff --git a/modules/core/starfish.nix b/modules/core/starfish.nix deleted file mode 100644 index c679872..0000000 --- a/modules/core/starfish.nix +++ /dev/null @@ -1,74 +0,0 @@ -{ ... }: -{ - programs = { - starship = { - enable = false; - settings = { - add_newline = false; - buf = { - symbol = " "; - }; - c = { - symbol = " "; - }; - directory = { - read_only = " 󰌾"; - }; - docker_context = { - symbol = " "; - }; - fossil_branch = { - symbol = " "; - }; - git_branch = { - symbol = " "; - }; - golang = { - symbol = " "; - }; - hg_branch = { - symbol = " "; - }; - hostname = { - ssh_symbol = " "; - }; - lua = { - symbol = " "; - }; - memory_usage = { - symbol = "󰍛 "; - }; - meson = { - symbol = "󰔷 "; - }; - nim = { - symbol = "󰆥 "; - }; - nix_shell = { - symbol = " "; - }; - nodejs = { - symbol = " "; - }; - ocaml = { - symbol = " "; - }; - package = { - symbol = "󰏗 "; - }; - python = { - symbol = " "; - }; - rust = { - symbol = " "; - }; - swift = { - symbol = " "; - }; - zig = { - symbol = " "; - }; - }; - }; - }; -} diff --git a/modules/core/steam.nix b/modules/core/steam.nix index 8ff9bf7..59b6c09 100644 --- a/modules/core/steam.nix +++ b/modules/core/steam.nix @@ -8,16 +8,14 @@ gamescopeSession.enable = true; extraCompatPackages = [ pkgs.proton-ge-bin ]; }; - - gamescope = { - enable = true; - capSysNice = true; - args = [ - "--rt" - "--expose-wayland" - ]; - }; - + # gamescope = { + # enable = true; + # capSysNice = true; + # args = [ + # "--rt" + # "--expose-wayland" + # ]; + # }; gamemode.enable = true; }; } diff --git a/modules/home/anki.nix b/modules/home/anki.nix new file mode 100644 index 0000000..b004881 --- /dev/null +++ b/modules/home/anki.nix @@ -0,0 +1,7 @@ +{ pkgs, ... }: +{ + programs.anki = { + enable = true; + package = pkgs.anki; + }; +} diff --git a/modules/home/cava.nix b/modules/home/cava.nix index cbb00b6..38a55d4 100644 --- a/modules/home/cava.nix +++ b/modules/home/cava.nix @@ -1,5 +1,4 @@ -{ config, ... }: -{ +_: { programs.cava = { enable = true; settings = { diff --git a/modules/home/chromium.nix b/modules/home/chromium.nix new file mode 100644 index 0000000..86b4ffa --- /dev/null +++ b/modules/home/chromium.nix @@ -0,0 +1,37 @@ +{ pkgs, ... }: +{ + programs.chromium = { + enable = true; + package = pkgs.ungoogled-chromium; + commandLineArgs = [ + "--disable-gpu" # Do czasu aż naprawią problemy + ]; + dictionaries = with pkgs; [ + hunspellDictsChromium.en_US + # hunspellDictsChromium.pl_PL Jeśli się taka pojawi + ]; + extensions = [ + { + id = "ocaahdebbfolfmndjeplogmgcagdmblk"; # Chromium Web Store + } + { + id = "eimadpbcbfnmbkopoojfekhnkhdbieeh"; # Dark Reader + } + { + id = "fnaicdffflnofjppbagibeoednhnbjhg"; # floccus bookmarks sync + } + { + id = "amknoiejhlmhancpahfcfcfhllgkpbld"; # Hoppscotch Browser Extension + } + { + id = "nngceckbapebfimnlniiiahkandclblb"; # Menedżer haseł Bitwarden + } + { + id = "fdaphilojaklgkoocegabckfanjoacjg"; # mtab + } + { + id = "cjpalhdlnbpafiamejdnhcphjbkeiagm"; # uBlock Origin + } + ]; + }; +} diff --git a/modules/home/default.nix b/modules/home/default.nix index b29b7ed..05593da 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -11,6 +11,7 @@ in waybarChoice ./wlogout ./amfora.nix + ./anki.nix ./bash.nix ./bash-aliases.nix ./bash-functions.nix @@ -18,16 +19,20 @@ in ./btop.nix ./bottom.nix ./cava.nix + ./chromium.nix ./emoji.nix ./eza.nix ./fzf.nix ./gh.nix ./git.nix ./gtk.nix + ./kdeConnect.nix ./kitty.nix - ./lazygit.nix ./librewolf.nix + ./lutris.nix + ./nextcloud.nix ./obs-studio.nix + ./onlyoffice.nix ./qt.nix ./ssh.nix ./starship.nix @@ -35,10 +40,11 @@ in ./swappy.nix ./swaync.nix ./tealdeer.nix + ./vesktop.nix ./virtmanager.nix ./xdg.nix ./zoxide.nix ./vscode.nix - # ./zed.nix + ./zed.nix ]; } diff --git a/modules/home/hyprland/binds.nix b/modules/home/hyprland/binds.nix index e26ff85..b1d744b 100644 --- a/modules/home/hyprland/binds.nix +++ b/modules/home/hyprland/binds.nix @@ -12,7 +12,7 @@ in "$modifier, A, exec, anki" "$modifier, B, exec, bitwarden" "$modifier, C, exec, chromium" - "$modifier, D, exec, discord" + "$modifier, D, exec, vesktop" "$modifier, G, exec, gimp" "$modifier, I, exec, iotas" "$modifier, L, exec, logseq" @@ -54,7 +54,6 @@ in "$modifier, E, exec, emopicker9000" "$modifier, K, exec, galculator" "$modifier, P, exec, hyprpicker -a" - # "$modifier ALT, K, exec, kronometer" "$modifier ALT, W, exec, wallsetter" "$modifier SHIFT, K, exec, list-keybinds" "$modifier SHIFT, P, exec, pavucontrol" diff --git a/modules/home/kdeConnect.nix b/modules/home/kdeConnect.nix new file mode 100644 index 0000000..6108770 --- /dev/null +++ b/modules/home/kdeConnect.nix @@ -0,0 +1,8 @@ +{ pkgs, ... }: +{ + services.kdeconnect = { + enable = true; + indicator = true; + package = pkgs.kdePackages.kdeconnect-kde; + }; +} diff --git a/modules/home/lazygit.nix b/modules/home/lazygit.nix deleted file mode 100644 index 021de2d..0000000 --- a/modules/home/lazygit.nix +++ /dev/null @@ -1,35 +0,0 @@ -# Lazygit is a simple terminal UI for git commands. -{ config, lib, ... }: -let - accent = "#${config.lib.stylix.colors.base0D}"; - muted = "#${config.lib.stylix.colors.base03}"; -in -{ - programs.lazygit = { - enable = true; - settings = lib.mkForce { - disableStartupPopups = true; - notARepository = "skip"; - promptToReturnFromSubprocess = false; - update.method = "never"; - git = { - commit.signOff = true; - parseEmoji = true; - }; - gui = { - theme = { - activeBorderColor = [ - accent - "bold" - ]; - inactiveBorderColor = [ muted ]; - }; - showListFooter = false; - showRandomTip = false; - showCommandLog = false; - showBottomLine = false; - nerdFontsVersion = "3"; - }; - }; - }; -} diff --git a/modules/home/lutris.nix b/modules/home/lutris.nix new file mode 100644 index 0000000..1fd2c3a --- /dev/null +++ b/modules/home/lutris.nix @@ -0,0 +1,11 @@ +{ pkgs, osConfig, ... }: +{ + programs.lutris = { + enable = true; + package = pkgs.lutris; + protonPackages = [ pkgs.proton-ge-bin ]; + winePackages = [ pkgs.wineWowPackages.waylandFull ]; + defaultWinePackage = pkgs.wineWowPackages.waylandFull; + steamPackage = osConfig.programs.steam.package; + }; +} diff --git a/modules/home/nextcloud.nix b/modules/home/nextcloud.nix new file mode 100644 index 0000000..62d39c9 --- /dev/null +++ b/modules/home/nextcloud.nix @@ -0,0 +1,8 @@ +{ pkgs, ... }: +{ + services.nextcloud-client = { + enable = true; + startInBackground = true; + package = pkgs.nextcloud-client; + }; +} diff --git a/modules/home/onlyoffice.nix b/modules/home/onlyoffice.nix new file mode 100644 index 0000000..0a3ea22 --- /dev/null +++ b/modules/home/onlyoffice.nix @@ -0,0 +1,13 @@ +{ pkgs, ... }: +{ + programs.onlyoffice = { + enable = true; + package = pkgs.onlyoffice-desktopeditors; + settings = { + UITheme = "theme-night"; + editorWindowMode = false; + position = "@Rect(10 50 1900 1020)"; + titlebar = "custom"; + }; + }; +} diff --git a/modules/home/scripts/keybinds.nix b/modules/home/scripts/keybinds.nix index 3935fda..3a3da16 100644 --- a/modules/home/scripts/keybinds.nix +++ b/modules/home/scripts/keybinds.nix @@ -11,8 +11,17 @@ pkgs.writeShellScriptBin "list-keybinds" '' msg=' = Windows/Super/CAPS LOCK (Enter nie wykonuje skrótu)' keybinds=$(cat ~/.config/hypr/hyprland.conf | grep -E '^bind') - # replace #modifier with SUPER in the displayed keybinds for rofi - display_keybinds=$(echo "$keybinds" | sed 's/\$modifier//g' | sed 's|${desktopEntriesPath}/||g') + # replace $modifier with SUPER and clean up paths + display_keybinds=$(echo "$keybinds" | sed 's/\$modifier//g' | sed 's|${desktopEntriesPath}/||g') + + # remove "bind=" and "bindm=" prefixes + display_keybinds=$(echo "$display_keybinds" | sed 's/^bind=//' | sed 's/^bindm=/🖱️/') + + # add + before CONTROL, SHIFT, ALT when they appear after removed $modifier + display_keybinds=$(echo "$display_keybinds" | sed 's/ CONTROL/ + CONTROL/g' | sed 's/ SHIFT/ + SHIFT/g' | sed 's/ ALT/ + ALT/g') + + # replace commas: first comma -> " +", second comma -> " =", remaining commas -> " ->" + display_keybinds=$(echo "$display_keybinds" | sed 's/,/ +/1' | sed 's/,/ =/1' | sed 's/,/ ->/g') # use rofi to display the keybinds with the modified content echo "$display_keybinds" | rofi -dmenu -i -config ~/.config/rofi/config-long.rasi -mesg "$msg" diff --git a/modules/home/stylix.nix b/modules/home/stylix.nix index f493c33..f8ee705 100644 --- a/modules/home/stylix.nix +++ b/modules/home/stylix.nix @@ -6,8 +6,8 @@ rofi.enable = false; hyprland.enable = false; hyprlock.enable = false; - ghostty.enable = false; vscode.enable = false; + zed.enable = false; qt = { enable = true; platform = "qtct"; diff --git a/modules/home/vesktop.nix b/modules/home/vesktop.nix new file mode 100644 index 0000000..93f5322 --- /dev/null +++ b/modules/home/vesktop.nix @@ -0,0 +1,3 @@ +_: { + programs.vesktop.enable = true; +} diff --git a/modules/home/xdg.nix b/modules/home/xdg.nix index 9e5ef36..4521d7c 100644 --- a/modules/home/xdg.nix +++ b/modules/home/xdg.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ pkgs, config, ... }: let messengerIcon = pkgs.fetchurl { url = "https://assets.stickpng.com/images/580b57fcd9996e24bc43c526.png"; @@ -32,8 +32,23 @@ in mimeApps.enable = true; portal = { enable = true; - extraPortals = [ pkgs.xdg-desktop-portal-hyprland ]; - configPackages = [ pkgs.hyprland ]; + extraPortals = with pkgs; [ + xdg-desktop-portal-hyprland + xdg-desktop-portal-gtk + kdePackages.xdg-desktop-portal-kde + ]; + configPackages = [ config.wayland.windowManager.hyprland.package ]; + config = { + common.default = "*"; + hyprland = { + default = [ + "hyprland" + "gtk" + ]; + "org.freedesktop.impl.portal.FileChooser" = "kde"; + "org.freedesktop.impl.portal.Print" = "kde"; + }; + }; }; desktopEntries = { "messenger" = { diff --git a/modules/home/zed.nix b/modules/home/zed.nix index 0f23040..8678528 100644 --- a/modules/home/zed.nix +++ b/modules/home/zed.nix @@ -1,124 +1,61 @@ -{ pkgs, lib, ... }: +{ pkgs, ... }: { programs.zed-editor = { enable = true; + package = pkgs.zed-editor; + installRemoteServer = true; extensions = [ - "nix" - "one-dark-pro-monokai-darker" "toml" - "superhtml" "dockerfile" - "docker-compose" + "git-firefly" "vue" + "astro" + "docker-compose" + "nix" + "csv" + "rainbow-csv" "vscode-icons" + "codebook" + "python-requirements" + "one-dark-pro-monokai-darker" + "hyprlang" + "json5" + "html-jinja" + "deputy" ]; + extraPackages = [ ]; + userSettings = { - assistant = { - enabled = true; - version = "2"; - default_open_ai_model = null; - ### PROVIDER OPTIONS - ### zed.dev models { claude-3-5-sonnet-latest } requires github connected - ### anthropic models { claude-3-5-sonnet-latest claude-3-haiku-latest claude-3-opus-latest } requires API_KEY - ### copilot_chat models { gpt-4o gpt-4 gpt-3.5-turbo o1-preview } requires github connected + agent = { + always_allow_tool_actions = true; + default_profile = "ask"; default_model = { - provider = "zed.dev"; - model = "claude-3-5-sonnet-latest"; - }; - - # inline_alternatives = [ - # { - # provider = "copilot_chat"; - # model = "gpt-3.5-turbo"; - # } - # ]; - }; - - node = { - path = lib.getExe pkgs.nodejs; - npm_path = lib.getExe' pkgs.nodejs "npm"; - }; - - hour_format = "hour24"; - auto_update = false; - terminal = { - alternate_scroll = "off"; - blinking = "off"; - copy_on_select = false; - dock = "bottom"; - detect_venv = { - on = { - directories = [ - ".env" - "env" - ".venv" - "venv" - ]; - activate_script = "default"; - }; - }; - # env = { - # TERM = "alacritty"; - # }; - font_family = "FiraCode Nerd Font"; - font_features = null; - font_size = null; - line_height = "comfortable"; - option_as_meta = false; - button = false; - shell = "system"; - #{ - # program = "zsh"; - #}; - toolbar = { - title = true; - }; - working_directory = "current_project_directory"; - }; - - # lsp = { - # rust-analyzer = { - # binary = { - # path = lib.getExe pkgs.rust-analyzer; - # path_lookup = true; - # }; - # }; - # nix = { - # binary = { - # path_lookup = true; - # }; - # }; - # }; - - languages = { - "HTML" = { - "language_servers" = [ - "vscode-html-language-server" - "superhtml" - ]; - "formatter" = { - "language_server" = { - "name" = "superhtml"; - }; - }; + provider = "anthropic"; + model = "claude-sonnet-4-latest"; }; }; - - vim_mode = false; - load_direnv = "shell_hook"; - base_keymap = "VSCode"; - theme = { - mode = "system"; - light = "One Dark Pro Monokai Darker Theme"; - dark = "One Dark Pro Monokai Darker Theme"; + telemetry = { + diagnostics = false; + metrics = false; }; - show_whitespaces = "all"; + icon_theme = "VSCode Icons (Dark)"; ui_font_size = 16; - buffer_font_size = 16; - + buffer_font_size = 15; + theme = { + mode = "dark"; + light = "One Light"; + dark = "One Dark Pro Monokai Darker"; + }; + languages = { + Python = { + language_servers = [ "!basedpyright" ]; + }; + YAML = { + tab_size = 2; + }; + }; }; - }; }