From 142605387efcbd04161f2579fdb42560b4f71028 Mon Sep 17 00:00:00 2001 From: installer Date: Mon, 27 Jan 2025 17:44:03 +0100 Subject: [PATCH] aktualizacja i kilka zmian --- flake.lock | 65 ++++++++++++++++------------------ hosts/default/config.nix | 8 ++--- hosts/default/home.nix | 1 - hosts/garand-laptop/config.nix | 39 +++++++++++--------- hosts/garand-laptop/home.nix | 3 ++ 5 files changed, 60 insertions(+), 56 deletions(-) diff --git a/flake.lock b/flake.lock index 0c8add1..4a7dd16 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1733175750, - "narHash": "sha256-tczSI0dnsitstia/uVt7FyGQbtuW8lMhhMYj0TRSAT4=", + "lastModified": 1737497253, + "narHash": "sha256-sOLwi/3oQiNWA2I3WiGneK988YdKVHbH1P5lEjxypIg=", "owner": "AdnanHodzic", "repo": "auto-cpufreq", - "rev": "4dae1d4b59bedc1d57118a9eb704c2e1cde5f83c", + "rev": "4cee388c1bbea3adc333b597717d5d8d12375705", "type": "github" }, "original": { @@ -57,11 +57,11 @@ "base16-helix": { "flake": false, "locked": { - "lastModified": 1725860795, - "narHash": "sha256-Z2o8VBPW3I+KKTSfe25kskz0EUj7MpUh8u355Z1nVsU=", + "lastModified": 1736852337, + "narHash": "sha256-esD42YdgLlEh7koBrSqcT7p2fsMctPAcGl/+2sYJa2o=", "owner": "tinted-theming", "repo": "base16-helix", - "rev": "7f795bf75d38e0eea9fed287264067ca187b88a9", + "rev": "03860521c40b0b9c04818f2218d9cc9efc21e7a5", "type": "github" }, "original": { @@ -73,11 +73,11 @@ "base16-vim": { "flake": false, "locked": { - "lastModified": 1731949548, - "narHash": "sha256-XIDexXM66sSh5j/x70e054BnUsviibUShW7XhbDGhYo=", + "lastModified": 1735953590, + "narHash": "sha256-YbQwaApLFJobn/0lbpMKcJ8N5axKlW2QIGkDS5+xoSU=", "owner": "tinted-theming", "repo": "base16-vim", - "rev": "61165b1632409bd55e530f3dbdd4477f011cadc6", + "rev": "c2a1232aa2c0ed27dcbf005779bcfe0e0ab5e85d", "type": "github" }, "original": { @@ -89,11 +89,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1734969791, - "narHash": "sha256-A9PxLienMYJ/WUvqFie9qXrNC2MeRRYw7TG/q7DRjZg=", + "lastModified": 1736899990, + "narHash": "sha256-S79Hqn2EtSxU4kp99t8tRschSifWD4p/51++0xNWUxw=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "92f4890bd150fc9d97b61b3583680c0524a8cafe", + "rev": "91ca1f82d717b02ceb03a3f423cbe8082ebbb26d", "type": "github" }, "original": { @@ -105,11 +105,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", "type": "github" }, "original": { @@ -165,19 +165,14 @@ "nixpkgs": [ "stylix", "nixpkgs" - ], - "nixpkgs-stable": [ - "stylix", - "git-hooks", - "nixpkgs" ] }, "locked": { - "lastModified": 1731363552, - "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", + "lastModified": 1735882644, + "narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", + "rev": "a5a961387e75ae44cc20f0a57ae463da5e959656", "type": "github" }, "original": { @@ -232,11 +227,11 @@ ] }, "locked": { - "lastModified": 1736277415, - "narHash": "sha256-kPDXF6cIPsVqSK08XF5EC6KM7BdMnM9vtJDzsnf+lLU=", + "lastModified": 1737968762, + "narHash": "sha256-xiPARGKwocaMtv+U/rgi+h2g56CZZEmrcl7ldRaslq8=", "owner": "nix-community", "repo": "home-manager", - "rev": "5c4302313d9207f7ec0886d68f8ff4a3c71209a1", + "rev": "e1ae908bcc30af792b0bb0a52e53b03d2577255e", "type": "github" }, "original": { @@ -248,11 +243,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1736012469, - "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", + "lastModified": 1737885589, + "narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", + "rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8", "type": "github" }, "original": { @@ -294,11 +289,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1736274934, - "narHash": "sha256-mAAjaD6rPZLH7NDezJlZWAl8Se5BP0sboVnX8pvCNQ8=", + "lastModified": 1737930520, + "narHash": "sha256-CAgB9/o54SXzqWwypA+hL2ETxiHW92Y+Ou4fT581jdk=", "owner": "danth", "repo": "stylix", - "rev": "5c84f02fcfb4fc697f132e90b8b3f9598c809b96", + "rev": "6103431cd2f9d4352e5493a4063cf57e307d355c", "type": "github" }, "original": { @@ -359,11 +354,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1729501581, - "narHash": "sha256-1ohEFMC23elnl39kxWnjzH1l2DFWWx4DhFNNYDTYt54=", + "lastModified": 1735737224, + "narHash": "sha256-FO2hRBkZsjlIRqzNHCPc/52yxg11kHGA8MEtSun9RwE=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "f0e7f7974a6441033eb0a172a0342e96722b4f14", + "rev": "aead506a9930c717ebf81cc83a2126e9ca08fa64", "type": "github" }, "original": { diff --git a/hosts/default/config.nix b/hosts/default/config.nix index db4fea2..5ba91b7 100644 --- a/hosts/default/config.nix +++ b/hosts/default/config.nix @@ -446,6 +446,10 @@ in { alsa.support32Bit = true; pulse.enable = true; }; + pulseaudio = { + enable = false; + extraConfig = "load-module module-combine-sink"; + }; rpcbind.enable = false; nfs.server.enable = false; }; @@ -472,10 +476,6 @@ in { enable = true; powerOnBoot = true; }; - pulseaudio = { - enable = false; - extraConfig = "load-module module-combine-sink"; - }; graphics = { enable = true; enable32Bit = true; diff --git a/hosts/default/home.nix b/hosts/default/home.nix index 2752771..c45a784 100644 --- a/hosts/default/home.nix +++ b/hosts/default/home.nix @@ -203,7 +203,6 @@ in { 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"; terminal = "cat /home/garand_plg/Documents/terminal.txt"; e-terminal = "nano /home/garand_plg/Documents/terminal.txt"; ".." = "cd .."; diff --git a/hosts/garand-laptop/config.nix b/hosts/garand-laptop/config.nix index e2c334b..96abaff 100644 --- a/hosts/garand-laptop/config.nix +++ b/hosts/garand-laptop/config.nix @@ -342,6 +342,13 @@ in { bastet nsnake exiftool + python3 + figlet + fortune + wtf + pipes + cava + wineWowPackages.waylandFull # wine64 # auto-cpufreq ]; @@ -447,6 +454,10 @@ in { alsa.support32Bit = true; pulse.enable = true; }; + pulseaudio = { + enable = false; + extraConfig = "load-module module-combine-sink"; + }; rpcbind.enable = false; nfs.server.enable = false; }; @@ -473,10 +484,6 @@ in { enable = true; powerOnBoot = true; }; - pulseaudio = { - enable = false; - extraConfig = "load-module module-combine-sink"; - }; graphics = { enable = true; enable32Bit = true; @@ -552,18 +559,18 @@ in { # }; }; - fileSystems."/mnt/Garand-Library" = { - device = "//192.168.1.156/Garand-Library"; - fsType = "cifs"; - options = [ - "rw" # Odczyt i zapis - "uid=1000" # UID użytkownika montującego (np. 1000 to często UID pierwszego użytkownika) - "gid=100" # GID grupy użytkownika montującego - "file_mode=0775" # Uprawnienia dla plików - "dir_mode=0775" # Uprawnienia dla katalogów - "credentials=/etc/smb-credentials" - ]; - }; + # fileSystems."/mnt/Garand-Library" = { + # device = "//192.168.1.156/Garand-Library"; + # fsType = "cifs"; + # options = [ + # "rw" # Odczyt i zapis + # "uid=1000" # UID użytkownika montującego (np. 1000 to często UID pierwszego użytkownika) + # "gid=100" # GID grupy użytkownika montującego + # "file_mode=0775" # Uprawnienia dla plików + # "dir_mode=0775" # Uprawnienia dla katalogów + # "credentials=/etc/smb-credentials" + # ]; + # }; # services.openvpn.servers = { # RO-P2P = { diff --git a/hosts/garand-laptop/home.nix b/hosts/garand-laptop/home.nix index 2752771..d496126 100644 --- a/hosts/garand-laptop/home.nix +++ b/hosts/garand-laptop/home.nix @@ -182,6 +182,7 @@ in { if [ -f $HOME/.bashrc-personal ]; then source $HOME/.bashrc-personal fi + fc ''; shellAliases = { os-sw = "sudo nixos-rebuild switch --flake ~/zaneyos"; @@ -204,9 +205,11 @@ 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"; + fc = "fortune | cowsay"; terminal = "cat /home/garand_plg/Documents/terminal.txt"; e-terminal = "nano /home/garand_plg/Documents/terminal.txt"; ".." = "cd .."; + KYS = "shutdown now"; }; }; home-manager.enable = true;