diff --git a/.gitignore b/.gitignore index d7a0af2..ecfa2b2 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -git-diff.txt \ No newline at end of file +git-diff.txt +packages/result \ No newline at end of file diff --git a/config/fastfetch/default.nix b/config/fastfetch/default.nix index 9890562..8bed710 100644 --- a/config/fastfetch/default.nix +++ b/config/fastfetch/default.nix @@ -10,16 +10,16 @@ }; }; - logo = { - source = ./nixos.png; - type = "kitty-direct"; - height = 15; - width = 30; - padding = { - top = 3; - left = 3; - }; - }; + # logo = { + # source = ./nixos.png; + # type = "kitty-direct"; + # height = 15; + # width = 30; + # padding = { + # top = 3; + # left = 3; + # }; + # }; modules = [ "break" diff --git a/config/hyprland.nix b/config/hyprland.nix index 87c121d..4aa638e 100644 --- a/config/hyprland.nix +++ b/config/hyprland.nix @@ -97,6 +97,7 @@ in windowrulev2 = opacity 0.9 0.7, class:^(chrome-dbipeoijaciefjfbfdkpfncmlbfinpge-Default)$ windowrulev2 = opacity 0.9 0.7, class:^(Bitwarden)$ windowrulev2 = opacity 0.9 0.7, class:^(chrome-akpamiohjfcnimfljfndmaldlcfphjmp-Default)$ + windowrulev2 = opacity 0.9 0.7, class:^(dev.warp.Warp)$ gestures { workspace_swipe = true workspace_swipe_fingers = 3 @@ -194,7 +195,6 @@ in bind = ${modifier},SPACE,togglespecialworkspace bind = ${modifier},Return,exec,${terminal} bind = ${modifier}SHIFT,Return,exec,rofi-launcher - bind = ${modifier}ALT,SPACE,exec,ulauncher-toggle bind = ${modifier}ALT,W,exec,wallsetter bind = ${modifier}SHIFT,S,exec,screenshootin bind = ${modifier},E,exec,emopicker9000 @@ -215,7 +215,8 @@ in bind = ${modifier},I,exec,dex-instagram bind = ${modifier},R,exec,dex-portainer bind = ${modifier},U,exec,dex-mastodon - bind = ${modifier},Y,exec,dex-dailydev + bind = ${modifier},Y,exec,freetube + bind = ${modifier}SHIFT,Y,exec,dex-dailydev bind = ${modifier},V,exec,codium bind = ${modifier},O,exec,onlyoffice-desktopeditors bind = ${modifier}SHIFT,O,exec,obs diff --git a/flake.lock b/flake.lock index 71ed46a..be12fca 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1746268454, - "narHash": "sha256-cUrVjYzFn1zzR6m2hc02CdjlSPIADtAVo+7BE7qq0ZA=", + "lastModified": 1746769778, + "narHash": "sha256-27w0bzr8XlxEhB+UNiEgf6iySfFu+tVHcBDGah5PtVE=", "owner": "AdnanHodzic", "repo": "auto-cpufreq", - "rev": "3ffbee11df46921c9a60f118d3450a7e460f7b13", + "rev": "eaf8dd1bab1b11ec78ad173ee7ada9886bed92ad", "type": "github" }, "original": { @@ -25,11 +25,11 @@ "fromYaml": "fromYaml" }, "locked": { - "lastModified": 1745523430, - "narHash": "sha256-EAYWV+kXbwsH+8G/8UtmcunDeKwLwSOyfcmzZUkWE/c=", + "lastModified": 1746562888, + "narHash": "sha256-YgNJQyB5dQiwavdDFBMNKk1wyS77AtdgDk/VtU6wEaI=", "owner": "SenchoPens", "repo": "base16.nix", - "rev": "58bfe2553d937d8af0564f79d5b950afbef69717", + "rev": "806a1777a5db2a1ef9d5d6f493ef2381047f2b89", "type": "github" }, "original": { @@ -95,11 +95,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1746417810, - "narHash": "sha256-VhghpfFdvGiDeh6HqFhQncnLx4IrtFy4VWdCQvOwccI=", + "lastModified": 1747800214, + "narHash": "sha256-4zStSk4O6GT0kZhN/zERhMHbcJnwFtYt3rM01t6gNhA=", "owner": "rycee", "repo": "nur-expressions", - "rev": "14c779b4ff24742307127970549ac9a51de3f98a", + "rev": "54be6f6687f510002f7a1e6c3583278d989f3833", "type": "gitlab" }, "original": { @@ -144,7 +144,6 @@ "inputs": { "nixpkgs-lib": [ "stylix", - "nur", "nixpkgs" ] }, @@ -162,27 +161,6 @@ "type": "github" } }, - "flake-utils": { - "inputs": { - "systems": [ - "stylix", - "systems" - ] - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "fromYaml": { "flake": false, "locked": { @@ -250,16 +228,16 @@ "gnome-shell": { "flake": false, "locked": { - "lastModified": 1732369855, - "narHash": "sha256-JhUWbcYPjHO3Xs3x9/Z9RuqXbcp5yhPluGjwsdE2GMg=", + "lastModified": 1744584021, + "narHash": "sha256-0RJ4mJzf+klKF4Fuoc8VN8dpQQtZnKksFmR2jhWE1Ew=", "owner": "GNOME", "repo": "gnome-shell", - "rev": "dadd58f630eeea41d645ee225a63f719390829dc", + "rev": "52c517c8f6c199a1d6f5118fae500ef69ea845ae", "type": "github" }, "original": { "owner": "GNOME", - "ref": "47.2", + "ref": "48.1", "repo": "gnome-shell", "type": "github" } @@ -271,11 +249,11 @@ ] }, "locked": { - "lastModified": 1746413188, - "narHash": "sha256-i6BoiQP0PasExESQHszC0reQHfO6D4aI2GzOwZMOI20=", + "lastModified": 1747875884, + "narHash": "sha256-tdVx4kghhdy62LKuTnwE2RytOe8o88tah/yhpyuL0D4=", "owner": "nix-community", "repo": "home-manager", - "rev": "8a318641ac13d3bc0a53651feaee9560f9b2d89a", + "rev": "f9186c64fcc6ee5f0114547acf9e814c806a640b", "type": "github" }, "original": { @@ -287,11 +265,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1746328495, - "narHash": "sha256-uKCfuDs7ZM3QpCE/jnfubTg459CnKnJG/LwqEVEdEiw=", + "lastModified": 1747744144, + "narHash": "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q=", "owner": "nixos", "repo": "nixpkgs", - "rev": "979daf34c8cacebcd917d540070b52a3c2b9b16e", + "rev": "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f", "type": "github" }, "original": { @@ -303,7 +281,10 @@ }, "nur": { "inputs": { - "flake-parts": "flake-parts", + "flake-parts": [ + "stylix", + "flake-parts" + ], "nixpkgs": [ "stylix", "nixpkgs" @@ -341,7 +322,7 @@ "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", "flake-compat": "flake-compat", - "flake-utils": "flake-utils", + "flake-parts": "flake-parts", "git-hooks": "git-hooks", "gnome-shell": "gnome-shell", "home-manager": [ @@ -359,11 +340,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1746469524, - "narHash": "sha256-uwFQebWXtMsRBmzKOYa6jjs7PDnfSuwyrqPK6yzqamU=", + "lastModified": 1747904607, + "narHash": "sha256-2JWxCVAb8qnssrn/4FeIgs+Gk0VZuAfDsF+rUBE7cZU=", "owner": "danth", "repo": "stylix", - "rev": "45aa0e849282dba5979e7bb3d0f6676bbd9dc130", + "rev": "230705d5fb6c308402579b17e0261e9f15de6f46", "type": "github" }, "original": { @@ -407,17 +388,16 @@ "tinted-kitty": { "flake": false, "locked": { - "lastModified": 1716423189, - "narHash": "sha256-2xF3sH7UIwegn+2gKzMpFi3pk5DlIlM18+vj17Uf82U=", + "lastModified": 1735730497, + "narHash": "sha256-4KtB+FiUzIeK/4aHCKce3V9HwRvYaxX+F1edUrfgzb8=", "owner": "tinted-theming", "repo": "tinted-kitty", - "rev": "eb39e141db14baef052893285df9f266df041ff8", + "rev": "de6f888497f2c6b2279361bfc790f164bfd0f3fa", "type": "github" }, "original": { "owner": "tinted-theming", "repo": "tinted-kitty", - "rev": "eb39e141db14baef052893285df9f266df041ff8", "type": "github" } }, diff --git a/hosts/garand-laptop/config/nixpkgs/clients.nix b/hosts/garand-laptop/config/nixpkgs/clients.nix index f35b320..bc8b3af 100644 --- a/hosts/garand-laptop/config/nixpkgs/clients.nix +++ b/hosts/garand-laptop/config/nixpkgs/clients.nix @@ -12,5 +12,6 @@ docker-client anki-bin onlyoffice-bin + freetube ]; } diff --git a/hosts/garand-laptop/config/nixpkgs/fundamentals.nix b/hosts/garand-laptop/config/nixpkgs/fundamentals.nix index af3dd1f..d19e757 100644 --- a/hosts/garand-laptop/config/nixpkgs/fundamentals.nix +++ b/hosts/garand-laptop/config/nixpkgs/fundamentals.nix @@ -1,6 +1,7 @@ # Fundamentalne programy dla systemu {pkgs, ...}: { environment.systemPackages = with pkgs; [ + warp-terminal wget killall eza diff --git a/hosts/garand-laptop/config/nixpkgs/tools.nix b/hosts/garand-laptop/config/nixpkgs/tools.nix index 5264b06..762dc5e 100644 --- a/hosts/garand-laptop/config/nixpkgs/tools.nix +++ b/hosts/garand-laptop/config/nixpkgs/tools.nix @@ -13,7 +13,5 @@ # lazygit docker-slim dex - ulauncher - wmctrl ]; } diff --git a/hosts/garand-laptop/home/programs.librewolf.nix b/hosts/garand-laptop/home/programs.librewolf.nix index c002e72..adb01b8 100644 --- a/hosts/garand-laptop/home/programs.librewolf.nix +++ b/hosts/garand-laptop/home/programs.librewolf.nix @@ -59,6 +59,7 @@ "garand's-search" = { definedAliases = ["@g"]; urls = [{template = "https://search.garandplg.com/search?q={searchTerms}";}]; + suggestUrl = "https://search.garandplg.com/autocompleter?q={searchTerms}"; }; "youtube" = { definedAliases = ["@yt"]; diff --git a/hosts/garand-laptop/home/programs.nix b/hosts/garand-laptop/home/programs.nix index 22dbc4b..e8f1dea 100644 --- a/hosts/garand-laptop/home/programs.nix +++ b/hosts/garand-laptop/home/programs.nix @@ -60,7 +60,6 @@ in { if [ -f $HOME/.bashrc-personal ]; then source $HOME/.bashrc-personal fi - fc ''; shellAliases = { os-sw = "sudo nixos-rebuild switch --flake ~/zaneyos"; @@ -86,6 +85,7 @@ in { ll = "eza -lh --icons --grid --group-directories-first"; la = "eza -lah --icons --grid --group-directories-first"; ssh-server = "ssh garand_plg@192.168.1.156 -p 556 -i ~/.ssh/hp-t640-homeserver"; + scp-to-server = "function scp-to-server() { scp -i ~/.ssh/hp-t640-homeserver -P 556 $1 garand_plg@192.168.1.156:$2; }; scp-to-server"; fc = "fortune | cowsay"; terminal = "cat /home/garand_plg/Documents/terminal.txt"; e-terminal = "nano /home/garand_plg/Documents/terminal.txt"; diff --git a/hosts/garand-laptop/variables.nix b/hosts/garand-laptop/variables.nix index 718e077..7d33710 100644 --- a/hosts/garand-laptop/variables.nix +++ b/hosts/garand-laptop/variables.nix @@ -1,16 +1,12 @@ { - # Git Configuration ( For Pulling Software Repos ) gitUsername = "GarandPLG"; gitEmail = "garandplg@garandplg.com"; - # Hyprland Settings extraMonitorSettings = ""; - # Waybar Settings clock24h = true; - # Program Options - browser = "librewolf"; # Set Default Browser (google-chrome-stable for google-chrome) - terminal = "kitty"; # Set Default System Terminal + browser = "librewolf"; + terminal = "warp-terminal"; keyboardLayout = "pl"; } diff --git a/scripts/list-hypr-bindings.nix b/scripts/list-hypr-bindings.nix index dc835f0..5d8ebae 100755 --- a/scripts/list-hypr-bindings.nix +++ b/scripts/list-hypr-bindings.nix @@ -49,7 +49,6 @@ in " + Prawy przycisk myszy" "Zmień rozmiar okna" "resizewindow" \ " + ENTER" "Otwórz terminal" "${terminal}" \ " + SHIFT + ENTER" "Uruchom launcher aplikacji" "rofi-launcher" \ - " + ALT + SPACE" "Uruchom Ulauncher" "ulauncher-toggle" \ " + ALT + W" "Zmień tapetę" "wallsetter" \ " + SHIFT + S" "Zrób zrzut ekranu" "screenshootin" \ " + E" "Uruchom selektor emotikon" "emopicker9000" \ @@ -70,7 +69,8 @@ in " + I" "Uruchom Instagram" "dex-instagram" \ " + R" "Uruchom Portainer" "dex-portainer" \ " + U" "Uruchom Mastodon" "dex-mastodon" \ - " + Y" "Uruchom Daily.dev" "dex-dailydev" \ + " + Y" "Uruchom FreeTube" "freetube" \ + " + SHIFT + Y" "Uruchom Daily.dev" "dex-dailydev" \ " + V" "Uruchom Visual Studio Codium" "codium" \ " + O" "Uruchom ONLYOFFICE" "onlyoffice-desktopeditors" \ " + SHIFT + O" "Uruchom OBS" "obs" \