Update system packages and home configuration

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": {

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

modules/core/packages/development.nix

@@ -5,8 +5,6 @@
     nixd
     nil
     nixfmt-rfc-style
-    # Editors & IDEs
-    zed-editor
     # Learning & practice
     exercism
   ];

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
   ];

modules/core/packages/programs.nix

@@ -18,6 +18,5 @@
       enable = true;
       enableSSHSupport = true;
     };
-    kdeconnect.enable = true;
   };
 }

modules/core/packages/tools.nix

@@ -41,7 +41,7 @@
     appimage-run
     libnotify
     v4l-utils
-    # kronometer
+    tasktimer
     # Language dicts for Iotas
     hunspell
     hunspellDicts.pl_PL

modules/core/packages/virtualization.nix

@@ -4,7 +4,6 @@
     virt-viewer
     lazydocker
     docker-client
-    docker-compose
     distrobox
   ];
 }

modules/core/starfish.nix

@@ -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 = " ";
-        };
-      };
-    };
-  };
-}

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;
   };
 }

modules/home/anki.nix

@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+{
+  programs.anki = {
+    enable = true;
+    package = pkgs.anki;
+  };
+}

modules/home/cava.nix

@@ -1,5 +1,4 @@
-{ config, ... }:
-{
+_: {
   programs.cava = {
     enable = true;
     settings = {

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
+      }
+    ];
+  };
+}

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
   ];
 }

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"

modules/home/kdeConnect.nix

@@ -0,0 +1,8 @@
+{ pkgs, ... }:
+{
+  services.kdeconnect = {
+    enable = true;
+    indicator = true;
+    package = pkgs.kdePackages.kdeconnect-kde;
+  };
+}

modules/home/lazygit.nix

@@ -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";
-      };
-    };
-  };
-}

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;
+  };
+}

modules/home/nextcloud.nix

@@ -0,0 +1,8 @@
+{ pkgs, ... }:
+{
+  services.nextcloud-client = {
+    enable = true;
+    startInBackground = true;
+    package = pkgs.nextcloud-client;
+  };
+}

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";
+    };
+  };
+}

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"

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";

modules/home/vesktop.nix

@@ -0,0 +1,3 @@
+_: {
+  programs.vesktop.enable = true;
+}

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" = {

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;
+        };
+      };
     };
-
   };
 }