Update system packages and home configuration

This commit is contained in:
2025-10-17 01:20:53 +02:00
parent efb8dcda36
commit 873e9fd4e7
24 changed files with 189 additions and 263 deletions

24
flake.lock generated
View File

@@ -96,11 +96,11 @@
}, },
"locked": { "locked": {
"dir": "pkgs/firefox-addons", "dir": "pkgs/firefox-addons",
"lastModified": 1760328219, "lastModified": 1760587417,
"narHash": "sha256-4l8Y6X30p2i0Bql+BaBSoKYj0D16JnVgUWVgNUN2jEc=", "narHash": "sha256-zoEJAw7naU8QZiH4x4JN/lgUgdA4H2Stk1N2KgWA1TI=",
"owner": "rycee", "owner": "rycee",
"repo": "nur-expressions", "repo": "nur-expressions",
"rev": "cffa2e20e30efdd267a0b44c2f4e81c58f22648f", "rev": "b37dfe9a29574b11182dac6b9b2bdb6b55948520",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@@ -186,11 +186,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1760312644, "lastModified": 1760641408,
"narHash": "sha256-U9SkK45314urw9P7MmjhEgiQwwD/BTj+T3HTuz1JU1Q=", "narHash": "sha256-Y086n2U0kN9HjOo+UScwQDS27gKMiIlT6vDehvlmdAg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "e121f3773fa596ecaba5b22e518936a632d72a90", "rev": "847669dabf374d32a072bdab3f08cae7296ac011",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -234,11 +234,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1760284886, "lastModified": 1760524057,
"narHash": "sha256-TK9Kr0BYBQ/1P5kAsnNQhmWWKgmZXwUQr4ZMjCzWf2c=", "narHash": "sha256-EVAqOteLBFmd7pKkb0+FIUyzTF61VKi7YmvP1tw4nEw=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "cf3f5c4def3c7b5f1fc012b3d839575dbe552d43", "rev": "544961dfcce86422ba200ed9a0b00dd4b1486ec5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -325,11 +325,11 @@
"tinted-zed": "tinted-zed" "tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1760350849, "lastModified": 1760472212,
"narHash": "sha256-JqcM5Pkm5q1c9D5zpINJsN1yCB4Vq1cL12ZuFyo32T4=", "narHash": "sha256-4C3I/ssFsq8EgaUmZP0xv5V7RV0oCHgL/Rx+MUkuE+E=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "7b4957d716f4fb615bf0e37d3b23c112579b1408", "rev": "8d008296a1b3be9b57ad570f7acea00dd2fc92db",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@@ -2,20 +2,13 @@
{ {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
# Communication # Communication
discord
slack slack
mattermost-desktop mattermost-desktop
# Productivity & Office # Productivity & Office
bitwarden-desktop bitwarden-desktop
tutanota-desktop tutanota-desktop
anki-bin
onlyoffice-bin
iotas iotas
logseq logseq
# Cloud
nextcloud-client
# Browsers
ungoogled-chromium
# Utilities # Utilities
galculator galculator
gedit gedit

View File

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

View File

@@ -6,11 +6,7 @@
}: }:
{ {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
# Gaming platforms
lutris
wineWowPackages.waylandFull
inputs.prismlauncher-cracked.packages.${system}.default inputs.prismlauncher-cracked.packages.${system}.default
# Games
space-cadet-pinball space-cadet-pinball
tty-solitaire tty-solitaire
]; ];

View File

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

View File

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

View File

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

View File

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

View File

@@ -8,16 +8,14 @@
gamescopeSession.enable = true; gamescopeSession.enable = true;
extraCompatPackages = [ pkgs.proton-ge-bin ]; extraCompatPackages = [ pkgs.proton-ge-bin ];
}; };
# gamescope = {
gamescope = { # enable = true;
enable = true; # capSysNice = true;
capSysNice = true; # args = [
args = [ # "--rt"
"--rt" # "--expose-wayland"
"--expose-wayland" # ];
]; # };
};
gamemode.enable = true; gamemode.enable = true;
}; };
} }

7
modules/home/anki.nix Normal file
View File

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

View File

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

37
modules/home/chromium.nix Normal file
View File

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

View File

@@ -11,6 +11,7 @@ in
waybarChoice waybarChoice
./wlogout ./wlogout
./amfora.nix ./amfora.nix
./anki.nix
./bash.nix ./bash.nix
./bash-aliases.nix ./bash-aliases.nix
./bash-functions.nix ./bash-functions.nix
@@ -18,16 +19,20 @@ in
./btop.nix ./btop.nix
./bottom.nix ./bottom.nix
./cava.nix ./cava.nix
./chromium.nix
./emoji.nix ./emoji.nix
./eza.nix ./eza.nix
./fzf.nix ./fzf.nix
./gh.nix ./gh.nix
./git.nix ./git.nix
./gtk.nix ./gtk.nix
./kdeConnect.nix
./kitty.nix ./kitty.nix
./lazygit.nix
./librewolf.nix ./librewolf.nix
./lutris.nix
./nextcloud.nix
./obs-studio.nix ./obs-studio.nix
./onlyoffice.nix
./qt.nix ./qt.nix
./ssh.nix ./ssh.nix
./starship.nix ./starship.nix
@@ -35,10 +40,11 @@ in
./swappy.nix ./swappy.nix
./swaync.nix ./swaync.nix
./tealdeer.nix ./tealdeer.nix
./vesktop.nix
./virtmanager.nix ./virtmanager.nix
./xdg.nix ./xdg.nix
./zoxide.nix ./zoxide.nix
./vscode.nix ./vscode.nix
# ./zed.nix ./zed.nix
]; ];
} }

View File

@@ -12,7 +12,7 @@ in
"$modifier, A, exec, anki" "$modifier, A, exec, anki"
"$modifier, B, exec, bitwarden" "$modifier, B, exec, bitwarden"
"$modifier, C, exec, chromium" "$modifier, C, exec, chromium"
"$modifier, D, exec, discord" "$modifier, D, exec, vesktop"
"$modifier, G, exec, gimp" "$modifier, G, exec, gimp"
"$modifier, I, exec, iotas" "$modifier, I, exec, iotas"
"$modifier, L, exec, logseq" "$modifier, L, exec, logseq"
@@ -54,7 +54,6 @@ in
"$modifier, E, exec, emopicker9000" "$modifier, E, exec, emopicker9000"
"$modifier, K, exec, galculator" "$modifier, K, exec, galculator"
"$modifier, P, exec, hyprpicker -a" "$modifier, P, exec, hyprpicker -a"
# "$modifier ALT, K, exec, kronometer"
"$modifier ALT, W, exec, wallsetter" "$modifier ALT, W, exec, wallsetter"
"$modifier SHIFT, K, exec, list-keybinds" "$modifier SHIFT, K, exec, list-keybinds"
"$modifier SHIFT, P, exec, pavucontrol" "$modifier SHIFT, P, exec, pavucontrol"

View File

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

View File

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

11
modules/home/lutris.nix Normal file
View File

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

View File

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

View File

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

View File

@@ -11,8 +11,17 @@ pkgs.writeShellScriptBin "list-keybinds" ''
msg=' = Windows/Super/CAPS LOCK (Enter nie wykonuje skrótu)' msg=' = Windows/Super/CAPS LOCK (Enter nie wykonuje skrótu)'
keybinds=$(cat ~/.config/hypr/hyprland.conf | grep -E '^bind') keybinds=$(cat ~/.config/hypr/hyprland.conf | grep -E '^bind')
# replace #modifier with SUPER in the displayed keybinds for rofi # replace $modifier with SUPER and clean up paths
display_keybinds=$(echo "$keybinds" | sed 's/\$modifier//g' | sed 's|${desktopEntriesPath}/||g') 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 # use rofi to display the keybinds with the modified content
echo "$display_keybinds" | rofi -dmenu -i -config ~/.config/rofi/config-long.rasi -mesg "$msg" echo "$display_keybinds" | rofi -dmenu -i -config ~/.config/rofi/config-long.rasi -mesg "$msg"

View File

@@ -6,8 +6,8 @@
rofi.enable = false; rofi.enable = false;
hyprland.enable = false; hyprland.enable = false;
hyprlock.enable = false; hyprlock.enable = false;
ghostty.enable = false;
vscode.enable = false; vscode.enable = false;
zed.enable = false;
qt = { qt = {
enable = true; enable = true;
platform = "qtct"; platform = "qtct";

3
modules/home/vesktop.nix Normal file
View File

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

View File

@@ -1,4 +1,4 @@
{ pkgs, ... }: { pkgs, config, ... }:
let let
messengerIcon = pkgs.fetchurl { messengerIcon = pkgs.fetchurl {
url = "https://assets.stickpng.com/images/580b57fcd9996e24bc43c526.png"; url = "https://assets.stickpng.com/images/580b57fcd9996e24bc43c526.png";
@@ -32,8 +32,23 @@ in
mimeApps.enable = true; mimeApps.enable = true;
portal = { portal = {
enable = true; enable = true;
extraPortals = [ pkgs.xdg-desktop-portal-hyprland ]; extraPortals = with pkgs; [
configPackages = [ pkgs.hyprland ]; 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 = { desktopEntries = {
"messenger" = { "messenger" = {

View File

@@ -1,124 +1,61 @@
{ pkgs, lib, ... }: { pkgs, ... }:
{ {
programs.zed-editor = { programs.zed-editor = {
enable = true; enable = true;
package = pkgs.zed-editor;
installRemoteServer = true;
extensions = [ extensions = [
"nix"
"one-dark-pro-monokai-darker"
"toml" "toml"
"superhtml"
"dockerfile" "dockerfile"
"docker-compose" "git-firefly"
"vue" "vue"
"astro"
"docker-compose"
"nix"
"csv"
"rainbow-csv"
"vscode-icons" "vscode-icons"
"codebook"
"python-requirements"
"one-dark-pro-monokai-darker"
"hyprlang"
"json5"
"html-jinja"
"deputy"
]; ];
extraPackages = [ ];
userSettings = { userSettings = {
assistant = { agent = {
enabled = true; always_allow_tool_actions = true;
version = "2"; default_profile = "ask";
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
default_model = { default_model = {
provider = "zed.dev"; provider = "anthropic";
model = "claude-3-5-sonnet-latest"; model = "claude-sonnet-4-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";
};
};
}; };
}; };
telemetry = {
vim_mode = false; diagnostics = false;
load_direnv = "shell_hook"; metrics = false;
base_keymap = "VSCode";
theme = {
mode = "system";
light = "One Dark Pro Monokai Darker Theme";
dark = "One Dark Pro Monokai Darker Theme";
}; };
show_whitespaces = "all"; icon_theme = "VSCode Icons (Dark)";
ui_font_size = 16; 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;
};
};
}; };
}; };
} }