From fb2279a57565fe8a55a245f496d7d9b203bcf51b Mon Sep 17 00:00:00 2001 From: installer Date: Thu, 14 Aug 2025 13:22:53 +0200 Subject: [PATCH] =?UTF-8?q?aktualizacja=20i=20posprz=C4=85tanie=20plik?= =?UTF-8?q?=C3=B3w?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- flake.lock | 36 +++++++++---------- hosts/garand-laptop/config/hardware.nix | 14 -------- hosts/garand-laptop/config/nixpkgs.nix | 5 --- .../garand-laptop/config/nixpkgs/clients.nix | 2 +- .../config/nixpkgs/multimedia.nix | 1 - hosts/garand-laptop/config/nixpkgs/tools.nix | 2 +- hosts/garand-laptop/config/nixpkgs/tty.nix | 2 -- hosts/garand-laptop/config/services.nix | 26 -------------- hosts/garand-laptop/config/virtualization.nix | 6 ---- .../garand-laptop/home/programs.librewolf.nix | 2 +- hosts/garand-laptop/home/programs.nix | 13 ------- 11 files changed, 21 insertions(+), 88 deletions(-) diff --git a/flake.lock b/flake.lock index 5fbbc1b..ddd0c87 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1752472124, - "narHash": "sha256-uxwCXCfJB9LP8952IZAgUzkAuGEwOd43MJvWSgsACbY=", + "lastModified": 1752998173, + "narHash": "sha256-ZlYpBp2WOe03UrpjJGz5KTOL/pp7A452hJO/Vc8C4/0=", "owner": "AdnanHodzic", "repo": "auto-cpufreq", - "rev": "bb1abd934265054d27b0973adaa43cf285e3549a", + "rev": "562278377ffa96f3c1af49c7b499df028ce8d8bd", "type": "github" }, "original": { @@ -57,11 +57,11 @@ "base16-helix": { "flake": false, "locked": { - "lastModified": 1748408240, - "narHash": "sha256-9M2b1rMyMzJK0eusea0x3lyh3mu5nMeEDSc4RZkGm+g=", + "lastModified": 1752979451, + "narHash": "sha256-0CQM+FkYy0fOO/sMGhOoNL80ftsAzYCg9VhIrodqusM=", "owner": "tinted-theming", "repo": "base16-helix", - "rev": "6c711ab1a9db6f51e2f6887cc3345530b33e152e", + "rev": "27cf1e66e50abc622fb76a3019012dc07c678fac", "type": "github" }, "original": { @@ -95,11 +95,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1752811437, - "narHash": "sha256-TVWYBcNpeQ3fEloryVP9N2yJnC3vuPpoZF1RqFFWFt0=", + "lastModified": 1754512310, + "narHash": "sha256-gXE5lTYMOhpDJo+siLXW/3BzySPmLMD12GVB1QFVbyw=", "owner": "rycee", "repo": "nur-expressions", - "rev": "369dccacc0a8214600773b3bbbf68d98a19b74e8", + "rev": "2008f9aa7a5ccde48bfc1de5a919be5898da09c2", "type": "gitlab" }, "original": { @@ -186,11 +186,11 @@ ] }, "locked": { - "lastModified": 1752814804, - "narHash": "sha256-irfg7lnfEpJY+3Cffkluzp2MTVw1Uq9QGxFp6qadcXI=", + "lastModified": 1754924470, + "narHash": "sha256-asI/or9AcUMydwzodCgpHGytnMSNUlciw3uaycpXm4E=", "owner": "nix-community", "repo": "home-manager", - "rev": "d0300c8808e41da81d6edfc202f3d3833c157daf", + "rev": "67393957c27b4e4c6c48a60108a201413ced7800", "type": "github" }, "original": { @@ -218,11 +218,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1752687322, - "narHash": "sha256-RKwfXA4OZROjBTQAl9WOZQFm7L8Bo93FQwSJpAiSRvo=", + "lastModified": 1754725699, + "narHash": "sha256-iAcj9T/Y+3DBy2J0N+yF9XQQQ8IEb5swLFzs23CdP88=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6e987485eb2c77e5dcc5af4e3c70843711ef9251", + "rev": "85dbfc7aaf52ecb755f87e577ddbe6dbbdbc1054", "type": "github" }, "original": { @@ -309,11 +309,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1752750082, - "narHash": "sha256-NoVAqy+Wj4tgkvrYB8zWncl8Z6Hb80aX3t/TYGdsfaM=", + "lastModified": 1754851076, + "narHash": "sha256-k3+/24lN6E9BFRhryHocm7314t0Wtku0hgIdEWi15XI=", "owner": "danth", "repo": "stylix", - "rev": "03699ed214f6e8195bc7199d6ae3aeccf9732b08", + "rev": "afcfed6fd2a51615cd63aa7fa7608d670e7b61e5", "type": "github" }, "original": { diff --git a/hosts/garand-laptop/config/hardware.nix b/hosts/garand-laptop/config/hardware.nix index 9316620..97d3948 100644 --- a/hosts/garand-laptop/config/hardware.nix +++ b/hosts/garand-laptop/config/hardware.nix @@ -20,18 +20,4 @@ enable32Bit = true; }; }; - - # fileSystems."/mnt/Garand-Library" = { - # device = "//192.168.1.156/Garand-Library"; - # fsType = "cifs"; - # options = [ - # "credentials=/etc/smb-credentials" - # "uid=1000" - # "gid=100" - # "iocharset=utf8" - # "x-systemd.automount" - # "x-systemd.idle-timeout=60" - # "noauto" - # ]; - # }; } diff --git a/hosts/garand-laptop/config/nixpkgs.nix b/hosts/garand-laptop/config/nixpkgs.nix index ecc8251..23bed37 100644 --- a/hosts/garand-laptop/config/nixpkgs.nix +++ b/hosts/garand-laptop/config/nixpkgs.nix @@ -25,11 +25,6 @@ nixpkgs.config = { allowUnfree = true; pulseaudio = true; - # packageOverrides = pkgs: { - # ulauncher = pkgs.ulauncher.override { - # autoStart = true; - # }; - # }; }; # Extra Portal Configuration diff --git a/hosts/garand-laptop/config/nixpkgs/clients.nix b/hosts/garand-laptop/config/nixpkgs/clients.nix index 6967d98..e2f5a80 100644 --- a/hosts/garand-laptop/config/nixpkgs/clients.nix +++ b/hosts/garand-laptop/config/nixpkgs/clients.nix @@ -13,6 +13,6 @@ anki-bin onlyoffice-bin freetube - calyx-vpn + mattermost-desktop ]; } diff --git a/hosts/garand-laptop/config/nixpkgs/multimedia.nix b/hosts/garand-laptop/config/nixpkgs/multimedia.nix index b5029c7..22d62f9 100644 --- a/hosts/garand-laptop/config/nixpkgs/multimedia.nix +++ b/hosts/garand-laptop/config/nixpkgs/multimedia.nix @@ -12,6 +12,5 @@ vlc kdePackages.kdenlive obs-studio - # libreoffice ]; } diff --git a/hosts/garand-laptop/config/nixpkgs/tools.nix b/hosts/garand-laptop/config/nixpkgs/tools.nix index 5f33a8e..27ca570 100644 --- a/hosts/garand-laptop/config/nixpkgs/tools.nix +++ b/hosts/garand-laptop/config/nixpkgs/tools.nix @@ -8,7 +8,7 @@ virt-viewer libvirt greetd.tuigreet - # galculator + galculator lazydocker # lazygit docker-slim diff --git a/hosts/garand-laptop/config/nixpkgs/tty.nix b/hosts/garand-laptop/config/nixpkgs/tty.nix index 9f59028..dd4edd6 100644 --- a/hosts/garand-laptop/config/nixpkgs/tty.nix +++ b/hosts/garand-laptop/config/nixpkgs/tty.nix @@ -3,8 +3,6 @@ environment.systemPackages = with pkgs; [ gambit-chess tty-solitaire - # bastet - # nsnake cmatrix cowsay sl diff --git a/hosts/garand-laptop/config/services.nix b/hosts/garand-laptop/config/services.nix index 9b77397..67bd8e8 100644 --- a/hosts/garand-laptop/config/services.nix +++ b/hosts/garand-laptop/config/services.nix @@ -29,7 +29,6 @@ in { }; greetd = { enable = true; - vt = 3; settings = { default_session = { # Wayland Desktop Manager is installed only for user ryan via home-manager! @@ -94,31 +93,6 @@ in { }; rpcbind.enable = false; nfs.server.enable = false; - # ollama = { - # enable = true; - # package = pkgs.ollama; - # # acceleration = "rocm"; - # # environmentVariables = { - # # HCC_AMDGPU_TARGET = "gfx1036"; - # # }; - # # rocmOverrideGfx = "10.3.6"; - # loadModels = [ - # # "deepseek-r1:1.5b" - # # "deepseek-r1:7b" - # ]; - # }; - # open-webui = { - # enable = true; - # package = pkgs.open-webui; - # }; - # penvpn.servers = { - # RO-P2P = { - # config = '' - # config /home/garand_plg/Documents/RO-ovpn-tcp.ovpn - # ''; - # updateResolvConf = true; - # }; - # }; }; console.keyMap = "${keyboardLayout}"; diff --git a/hosts/garand-laptop/config/virtualization.nix b/hosts/garand-laptop/config/virtualization.nix index 3ba81f3..d7da299 100644 --- a/hosts/garand-laptop/config/virtualization.nix +++ b/hosts/garand-laptop/config/virtualization.nix @@ -6,11 +6,5 @@ enable = true; package = pkgs.docker; }; - # waydroid.enable = true; - # podman = { - # enable = true; - # dockerCompat = true; - # defaultNetwork.settings.dns_enabled = true; - # }; }; } diff --git a/hosts/garand-laptop/home/programs.librewolf.nix b/hosts/garand-laptop/home/programs.librewolf.nix index adb01b8..b059b35 100644 --- a/hosts/garand-laptop/home/programs.librewolf.nix +++ b/hosts/garand-laptop/home/programs.librewolf.nix @@ -282,7 +282,7 @@ ublock-origin sponsorblock darkreader - # flagfox + flagfox hoppscotch return-youtube-dislikes sponsorblock diff --git a/hosts/garand-laptop/home/programs.nix b/hosts/garand-laptop/home/programs.nix index 155d6ef..aac0e84 100644 --- a/hosts/garand-laptop/home/programs.nix +++ b/hosts/garand-laptop/home/programs.nix @@ -21,10 +21,6 @@ in { gh.enable = true; - # btop = { - # enable = false; - # }; - kitty = { enable = true; package = pkgs.kitty; @@ -68,27 +64,18 @@ in { os-up = "sudo nix flake update"; os-upg = "sudo nix flake update && sudo nixos-rebuild switch --flake ~/zaneyos"; os-up-np = "sudo nix flake update --update-input nixpkgs"; - os-up-hm = "sudo nix flake update --update-input home-manager"; - os-up-sx = "sudo nix flake update --update-input stylix"; - os-up-af = "sudo nix flake update --update-input auto-cpufreq"; - os-up-fa = "sudo nix flake update --update-input firefox-addons"; fr = "nh os switch --hostname ${host} /home/${username}/zaneyos"; fu = "nh os switch --hostname ${host} --update /home/${username}/zaneyos"; hypr-cli = "hyprctl clients"; - zu = "sh <(curl -L https://gitlab.com/Zaney/zaneyos/-/raw/main/install-zaneyos.sh)"; ncg = "nix-collect-garbage --delete-old && sudo nix-collect-garbage -d && sudo /run/current-system/bin/switch-to-configuration boot"; n = "nano"; - f = "fuck"; cat = "bat"; ookla = "speedtest"; ls = "eza --icons"; 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"; mkgidf = "git add --intent-to-add . && git diff > git-diff.txt"; ".." = "cd .."; kys = "shutdown now";