From ddd6e973d651b9d9c4d160c8ebb288daa071e259 Mon Sep 17 00:00:00 2001 From: Ryan Schanzenbacher Date: Mon, 20 Jan 2025 20:49:03 -0500 Subject: Updated Thinkpad config to latest, updated all packages, updated docker compose, changed nixGL to make hyprland work again, now using bash with starship config --- RyanThinkpad.scm | 11 +- home-config/bash_profile | 9 +- home-config/bashrc | 6 +- home-config/docker/cli-plugins/docker-compose | Bin 59699273 -> 64694701 bytes home-config/fish/fish_plugins | 5 - home-config/home-configuration.scm | 21 +- home-config/nix-home-manager/flake.lock | 270 ++++++++++++++++++-------- home-config/nix-home-manager/flake.nix | 9 +- home-config/nix-home-manager/home.nix | 30 ++- modules/ryan-config/base-system.scm | 2 +- 10 files changed, 250 insertions(+), 113 deletions(-) delete mode 100644 home-config/fish/fish_plugins diff --git a/RyanThinkpad.scm b/RyanThinkpad.scm index 1066bac..5ca1cf6 100644 --- a/RyanThinkpad.scm +++ b/RyanThinkpad.scm @@ -1,4 +1,5 @@ (use-modules (ryan-config base-system) + (ryan-bootloader uki) (gnu)) (operating-system @@ -10,7 +11,7 @@ (host-name "RyanThinkpad") (mapped-devices (list (mapped-device (source (uuid - "adcaf322-7ee5-48ec-abf6-4a9b10643878")) + "40a2c899-a54f-400b-b3b8-9f83b8378c61")) (target "sysroot") (type luks-device-mapping)))) (file-systems (cons* (file-system @@ -20,9 +21,13 @@ (dependencies mapped-devices)) (file-system (mount-point "/boot/efi") - (device (uuid "DFE8-32EF" + (device (uuid "A73D-7D13" 'fat32)) (type "vfat")) %base-file-systems)) + (bootloader (bootloader-configuration + (bootloader uefi-uki-bootloader) + (targets (list "/boot/efi")) + (keyboard-layout (keyboard-layout "us")))) (swap-devices (list - (swap-space (target (uuid "7e1bb7c5-da2a-4509-8263-f707fc752993")))))) + (swap-space (target (uuid "87b91351-93b6-4dcc-814f-64c0f901c4f3")))))) diff --git a/home-config/bash_profile b/home-config/bash_profile index 6bc7def..72ea319 100644 --- a/home-config/bash_profile +++ b/home-config/bash_profile @@ -1,16 +1,13 @@ export MOZ_ENABLE_WAYLAND=1 -export XDG_CURRENT_DESKTOP=sway -export XDG_SESSION_DESKTOP=sway -export _JAVA_AWT_WM_NONREPEATING=1 - export XDG_DATA_DIRS=$XDG_DATA_DIRS:~/.nix-profile/share -export PATH=~/.local/bin:$PATH:~/.nix-profile/bin +export PATH=~/.local/bin:$PATH:~/.nix-profile/bin:~/.go/bin +export GOPATH=~/.go # Honor per-interactive-shell startup file if [ -f ~/.bashrc ]; then . ~/.bashrc; fi if [ -z "$SSH_CLIENT" ] && [ -z "${DISPLAY}" ] && [ "${XDG_VTNR}" -eq 1 ]; then - exec Hyprland + exec nixGLIntel Hyprland fi diff --git a/home-config/bashrc b/home-config/bashrc index 26fbbf4..386a2db 100644 --- a/home-config/bashrc +++ b/home-config/bashrc @@ -51,4 +51,8 @@ export XDG_DATA_DIRS=$XDG_DATA_DIRS:/var/lib/flatpak/exports/share:/home/ryan/.l #gpgconf --launch gpg-agent export GPG_TTY=$(tty) -eval "$(zoxide init bash)" +# Zoxide +eval "$(zoxide init --cmd cd bash)" + +# Starship +eval "$(starship init bash)" diff --git a/home-config/docker/cli-plugins/docker-compose b/home-config/docker/cli-plugins/docker-compose index bf829e0..911e760 100755 Binary files a/home-config/docker/cli-plugins/docker-compose and b/home-config/docker/cli-plugins/docker-compose differ diff --git a/home-config/fish/fish_plugins b/home-config/fish/fish_plugins deleted file mode 100644 index 32f71ac..0000000 --- a/home-config/fish/fish_plugins +++ /dev/null @@ -1,5 +0,0 @@ -jorgebucaran/fisher -ilancosman/tide@v6 -patrickf1/fzf.fish -lilyball/nix-env.fish -oh-my-fish/plugin-foreign-env diff --git a/home-config/home-configuration.scm b/home-config/home-configuration.scm index 93ec9e1..3e35a56 100644 --- a/home-config/home-configuration.scm +++ b/home-config/home-configuration.scm @@ -37,7 +37,6 @@ (define %home-symlinks `((".config/guix/home-config/fish" ".config/fish") (".config/guix/home-config/nix-config" ".config/nix") - (".config/guix/home-config/tridactyl/native_main" ".local/share/tridactyl/native_main") (".config/guix/home-config/nix-home-manager" ".config/home-manager"))) (home-symlinks %home-symlinks) @@ -140,16 +139,16 @@ ;; Below is the list of Home services. To search for available ;; services, run 'guix home search KEYWORD' in a terminal. (services - (list ;(service home-bash-service-type - ; (home-bash-configuration - ;(aliases '(("grep" . "grep --color=auto") ("ll" . "ls -l") - ; ("ls" . "ls -p --color=auto") - ; ("spt" . "spotify_player") - ; ("python" . "python3"))) - ; (bashrc (list (local-file - ; "bashrc"))) - ; (bash-profile (list (local-file - ; "bash_profile"))))) + (list (service home-bash-service-type + (home-bash-configuration + (aliases '(("grep" . "grep --color=auto") ("ll" . "ls -l") + ("ls" . "ls -p --color=auto") + ("spt" . "spotify_player") + ("python" . "python3"))) + (bashrc (list (local-file + "bashrc"))) + (bash-profile (list (local-file + "bash_profile"))))) (service home-xdg-configuration-files-service-type `(("nvim/init.vim" ,(local-file "nvim/config/init.vim")) ("nvim/after/ftplugin/markdown/custom.vim" ,(local-file "nvim/config/after/ftplugin/markdown/custom.vim")) diff --git a/home-config/nix-home-manager/flake.lock b/home-config/nix-home-manager/flake.lock index 653901b..8e3e4ed 100644 --- a/home-config/nix-home-manager/flake.lock +++ b/home-config/nix-home-manager/flake.lock @@ -2,29 +2,17 @@ "nodes": { "aquamarine": { "inputs": { - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "hyprwayland-scanner": [ - "hyprland", - "hyprwayland-scanner" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] + "hyprutils": "hyprutils", + "hyprwayland-scanner": "hyprwayland-scanner", + "nixpkgs": "nixpkgs", + "systems": "systems" }, "locked": { - "lastModified": 1731959031, - "narHash": "sha256-TGcvIjftziC1CjuiHCzrYDwmOoSFYIhdiKmLetzB5L0=", + "lastModified": 1736702516, + "narHash": "sha256-NbJiiPFnmciji3JHpqF/L0SdMQXKXn+q3Q/D8RjF/ak=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "4468981c1c50999f315baa1508f0e53c4ee70c52", + "rev": "e7719f9b9f5321c7100733773ad9f38cb6db6b6f", "type": "github" }, "original": { @@ -93,17 +81,17 @@ ] }, "locked": { - "lastModified": 1735381016, - "narHash": "sha256-CyCZFhMUkuYbSD6bxB/r43EdmDE7hYeZZPTCv0GudO4=", + "lastModified": 1736785676, + "narHash": "sha256-TY0jUwR3EW0fnS0X5wXMAVy6h4Z7Y6a3m+Yq++C9AyE=", "owner": "nix-community", "repo": "home-manager", - "rev": "10e99c43cdf4a0713b4e81d90691d22c6a58bdf2", + "rev": "fc52a210b60f2f52c74eac41a8647c1573d2071d", "type": "github" }, "original": { "owner": "nix-community", "repo": "home-manager", - "rev": "10e99c43cdf4a0713b4e81d90691d22c6a58bdf2", + "rev": "fc52a210b60f2f52c74eac41a8647c1573d2071d", "type": "github" } }, @@ -123,11 +111,11 @@ ] }, "locked": { - "lastModified": 1728669738, - "narHash": "sha256-EDNAU9AYcx8OupUzbTbWE1d3HYdeG0wO6Msg3iL1muk=", + "lastModified": 1734906540, + "narHash": "sha256-vQ/L9hZFezC0LquLo4TWXkyniWtYBlFHAKIsDc7PYJE=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "0264e698149fcb857a66a53018157b41f8d97bb0", + "rev": "69270ba8f057d55b0e6c2dca0e165d652856e613", "type": "github" }, "original": { @@ -136,33 +124,64 @@ "type": "github" } }, + "hyprgraphics": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1736115290, + "narHash": "sha256-Jcn6yAzfUMcxy3tN/iZRbi/QgrYm7XLyVRl9g/nbUl4=", + "owner": "hyprwm", + "repo": "hyprgraphics", + "rev": "52202272d89da32a9f866c0d10305a5e3d954c50", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprgraphics", + "type": "github" + } + }, "hyprland": { "inputs": { "aquamarine": "aquamarine", "hyprcursor": "hyprcursor", + "hyprgraphics": "hyprgraphics", "hyprland-protocols": "hyprland-protocols", + "hyprland-qtutils": "hyprland-qtutils", "hyprlang": "hyprlang", - "hyprutils": "hyprutils", - "hyprwayland-scanner": "hyprwayland-scanner", + "hyprutils": "hyprutils_2", + "hyprwayland-scanner": "hyprwayland-scanner_2", "nixpkgs": [ "nixpkgs" ], "pre-commit-hooks": "pre-commit-hooks", - "systems": "systems", + "systems": "systems_2", "xdph": "xdph" }, "locked": { - "lastModified": 1732052838, - "narHash": "sha256-ENsVNUEvJp7/7f6x7MVqtiVkFKkGy0Ux/ZqQM3Sb4CQ=", + "lastModified": 1737038559, + "narHash": "sha256-irqN8zKwpQ0NFxEvV/wQRdopClwkyZXCQoF7mgX/Uss=", "owner": "hyprwm", "repo": "hyprland", - "rev": "12f9a0d0b93f691d4d9923716557154d74777b0a", + "rev": "0dc7367a7006cc3cc877d52bf34c4998144bff84", "type": "github" }, "original": { "owner": "hyprwm", - "ref": "v0.45.2", "repo": "hyprland", + "rev": "0dc7367a7006cc3cc877d52bf34c4998144bff84", "type": "github" } }, @@ -178,11 +197,11 @@ ] }, "locked": { - "lastModified": 1728345020, - "narHash": "sha256-xGbkc7U/Roe0/Cv3iKlzijIaFBNguasI31ynL2IlEoM=", + "lastModified": 1735774328, + "narHash": "sha256-vIRwLS9w+N99EU1aJ+XNOU6mJTxrUBa31i1r82l0V7s=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "a7c183800e74f337753de186522b9017a07a8cee", + "rev": "e3b6af97ddcfaafbda8e2828c719a5af84f662cb", "type": "github" }, "original": { @@ -191,6 +210,35 @@ "type": "github" } }, + "hyprland-qtutils": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1736114838, + "narHash": "sha256-FxbuGQExtN37ToWYnGmO6weOYN6WPHN/RAqbr7gNPek=", + "owner": "hyprwm", + "repo": "hyprland-qtutils", + "rev": "6997fe382dcf396704227d2b98ffdd5066da6959", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-qtutils", + "type": "github" + } + }, "hyprlang": { "inputs": { "hyprutils": [ @@ -207,11 +255,11 @@ ] }, "locked": { - "lastModified": 1728168612, - "narHash": "sha256-AnB1KfiXINmuiW7BALYrKqcjCnsLZPifhb/7BsfPbns=", + "lastModified": 1735393019, + "narHash": "sha256-NPpqA8rtmDLsEmZOmz+qR67zsB6Y503Jnv+nSFLKJZ8=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "f054f2e44d6a0b74607a6bc0f52dba337a3db38e", + "rev": "55608efdaa387af7bfdc0eddb404c409958efa43", "type": "github" }, "original": { @@ -222,12 +270,12 @@ }, "hyprpicker-git": { "inputs": { - "hyprutils": "hyprutils_2", - "hyprwayland-scanner": "hyprwayland-scanner_2", + "hyprutils": "hyprutils_3", + "hyprwayland-scanner": "hyprwayland-scanner_3", "nixpkgs": [ "nixpkgs" ], - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1727705155, @@ -248,19 +296,21 @@ "inputs": { "nixpkgs": [ "hyprland", + "aquamarine", "nixpkgs" ], "systems": [ "hyprland", + "aquamarine", "systems" ] }, "locked": { - "lastModified": 1731702627, - "narHash": "sha256-+JeO9gevnXannQxMfR5xzZtF4sYmSlWkX/BPmPx0mWk=", + "lastModified": 1736613432, + "narHash": "sha256-x7nMS1dFtlzgG13QoguKMZ6SKwSIQw82OANA5ZKF0d0=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "e911361a687753bbbdfe3b6a9eab755ecaf1d9e1", + "rev": "72dfbf52967e4040693164319a027d8ac6315887", "type": "github" }, "original": { @@ -270,6 +320,31 @@ } }, "hyprutils_2": { + "inputs": { + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1736164519, + "narHash": "sha256-1LimBKvDpBbeX+qW7T240WEyw+DBVpDotZB4JYm8Aps=", + "owner": "hyprwm", + "repo": "hyprutils", + "rev": "3c895da64b0eb19870142196fa48c07090b441c4", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprutils", + "type": "github" + } + }, + "hyprutils_3": { "inputs": { "nixpkgs": [ "hyprpicker-git", @@ -298,19 +373,21 @@ "inputs": { "nixpkgs": [ "hyprland", + "aquamarine", "nixpkgs" ], "systems": [ "hyprland", + "aquamarine", "systems" ] }, "locked": { - "lastModified": 1726874836, - "narHash": "sha256-VKR0sf0PSNCB0wPHVKSAn41mCNVCnegWmgkrneKDhHM=", + "lastModified": 1735493474, + "narHash": "sha256-fktzv4NaqKm94VAkAoVqO/nqQlw+X0/tJJNAeCSfzK4=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "500c81a9e1a76760371049a8d99e008ea77aa59e", + "rev": "de913476b59ee88685fdc018e77b8f6637a2ae0b", "type": "github" }, "original": { @@ -320,6 +397,31 @@ } }, "hyprwayland-scanner_2": { + "inputs": { + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1735493474, + "narHash": "sha256-fktzv4NaqKm94VAkAoVqO/nqQlw+X0/tJJNAeCSfzK4=", + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "rev": "de913476b59ee88685fdc018e77b8f6637a2ae0b", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "type": "github" + } + }, + "hyprwayland-scanner_3": { "inputs": { "nixpkgs": [ "hyprpicker-git", @@ -352,49 +454,49 @@ ] }, "locked": { - "lastModified": 1713543440, - "narHash": "sha256-lnzZQYG0+EXl/6NkGpyIz+FEOc/DSEG57AP1VsdeNrM=", - "owner": "nix-community", + "lastModified": 1736159088, + "narHash": "sha256-WDBc35XdHCdmgVYbPOtd2IeUtUHCYwNyEpIr5vLZMng=", + "owner": "bb010g", "repo": "nixGL", - "rev": "310f8e49a149e4c9ea52f1adf70cdc768ec53f8a", + "rev": "3865170cbc23b32ec7cc8df1ec811fd44b6c2a58", "type": "github" }, "original": { - "owner": "nix-community", + "owner": "bb010g", + "ref": "main", "repo": "nixGL", - "rev": "310f8e49a149e4c9ea52f1adf70cdc768ec53f8a", "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1735661352, - "narHash": "sha256-oSyxVJMvxB6op6Bd7u9TqBvbg8tiBd6aoiBAncMBzys=", - "owner": "nixos", + "lastModified": 1736883708, + "narHash": "sha256-uQ+NQ0/xYU0N1CnXsa2zghgNaOPxWpMJXSUJJ9W7140=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "b4801729f1a1acb33d74b413c1cb0ced0837fb78", + "rev": "eb62e6aa39ea67e0b8018ba8ea077efe65807dc8", "type": "github" }, "original": { - "owner": "nixos", + "owner": "NixOS", + "ref": "nixos-unstable", "repo": "nixpkgs", - "rev": "b4801729f1a1acb33d74b413c1cb0ced0837fb78", "type": "github" } }, - "nixpkgs-stable": { + "nixpkgs_2": { "locked": { - "lastModified": 1730741070, - "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", - "owner": "NixOS", + "lastModified": 1736012469, + "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3", + "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-24.05", + "owner": "nixos", "repo": "nixpkgs", + "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", "type": "github" } }, @@ -405,15 +507,14 @@ "nixpkgs": [ "hyprland", "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable" + ] }, "locked": { - "lastModified": 1732021966, - "narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=", + "lastModified": 1735882644, + "narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "3308484d1a443fc5bc92012435d79e80458fe43c", + "rev": "a5a961387e75ae44cc20f0a57ae463da5e959656", "type": "github" }, "original": { @@ -428,7 +529,7 @@ "hyprland": "hyprland", "hyprpicker-git": "hyprpicker-git", "nixgl": "nixgl", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "wpaperd": "wpaperd" } }, @@ -498,13 +599,28 @@ "type": "github" } }, + "systems_4": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, "wpaperd": { "inputs": { "nixpkgs": [ "nixpkgs" ], "rust-overlay": "rust-overlay", - "systems": "systems_3" + "systems": "systems_4" }, "locked": { "lastModified": 1731514601, @@ -549,11 +665,11 @@ ] }, "locked": { - "lastModified": 1731703417, - "narHash": "sha256-rheDc/7C+yI+QspYr9J2z9kQ5P9F4ATapI7qyFAe1XA=", + "lastModified": 1734907020, + "narHash": "sha256-p6HxwpRKVl1KIiY5xrJdjcEeK3pbmc///UOyV6QER+w=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "8070f36deec723de71e7557441acb17e478204d3", + "rev": "d7f18dda5e511749fa1511185db3536208fb1a63", "type": "github" }, "original": { diff --git a/home-config/nix-home-manager/flake.nix b/home-config/nix-home-manager/flake.nix index c64d043..af0af94 100644 --- a/home-config/nix-home-manager/flake.nix +++ b/home-config/nix-home-manager/flake.nix @@ -3,9 +3,9 @@ inputs = { # Specify the source of Home Manager and Nixpkgs. - nixpkgs.url = "github:nixos/nixpkgs/b4801729f1a1acb33d74b413c1cb0ced0837fb78"; + nixpkgs.url = "github:nixos/nixpkgs/8f3e1f807051e32d8c95cd12b9b421623850a34d"; home-manager = { - url = "github:nix-community/home-manager/10e99c43cdf4a0713b4e81d90691d22c6a58bdf2"; + url = "github:nix-community/home-manager/fc52a210b60f2f52c74eac41a8647c1573d2071d"; inputs.nixpkgs.follows = "nixpkgs"; }; hyprpicker-git = { @@ -13,11 +13,12 @@ inputs.nixpkgs.follows = "nixpkgs"; }; hyprland = { - url = "github:hyprwm/hyprland/v0.45.2"; + url = "github:hyprwm/hyprland/0dc7367a7006cc3cc877d52bf34c4998144bff84"; inputs.nixpkgs.follows = "nixpkgs"; + inputs.aquamarine.url = "github:hyprwm/aquamarine/main"; }; nixgl = { - url = "github:nix-community/nixGL/310f8e49a149e4c9ea52f1adf70cdc768ec53f8a"; + url = "github:bb010g/nixGL/main"; inputs.nixpkgs.follows = "nixpkgs"; }; wpaperd = { diff --git a/home-config/nix-home-manager/home.nix b/home-config/nix-home-manager/home.nix index 5e85304..4c889c9 100644 --- a/home-config/nix-home-manager/home.nix +++ b/home-config/nix-home-manager/home.nix @@ -15,6 +15,9 @@ home.username = "ryan"; home.homeDirectory = "/home/ryan"; + # Ignore news + news.display = "silent"; + # This value determines the Home Manager release that your configuration is # compatible with. This helps avoid breakage when a new Home Manager release # introduces backwards incompatible changes. @@ -344,6 +347,22 @@ }; }; + programs.starship = { + enable = true; + settings = { + add_newline = false; + character = { + success_symbol = "[➜](bold green)"; + error_symbol = "[➜](bold red)"; + }; + time = { + disabled = false; + format = "\[ $time \]($style)"; + time_format = "%T"; + }; + }; + }; + # The home.packages option allows you to install Nix packages into your # environment. home.packages = with pkgs; [ @@ -377,13 +396,14 @@ #latest.firefox-nightly-bin eza wl-mirror + starship # Wrapped programs for some env variables - (pkgs.writeScriptBin "hyprlock" '' - #! ${pkgs.bash}/bin/bash - export LD_PRELOAD="/run/current-system/profile/lib/libpam.so.0:/run/current-system/profile/lib/libfontconfig.so:$LD_PRELOAD" - exec ${pkgs.hyprlock}/bin/hyprlock "$@" - '') + # (pkgs.writeScriptBin "hyprlock" '' + # #! ${pkgs.bash}/bin/bash + # export LD_PRELOAD="/run/current-system/profile/lib/libpam.so.0:/run/current-system/profile/lib/libfontconfig.so:$LD_PRELOAD" + # exec ${pkgs.hyprlock}/bin/hyprlock "$@" + # '') # Flakes specific things defined in flake.nix hyprland.packages.${pkgs.system}.default diff --git a/modules/ryan-config/base-system.scm b/modules/ryan-config/base-system.scm index 01c5836..56456fa 100644 --- a/modules/ryan-config/base-system.scm +++ b/modules/ryan-config/base-system.scm @@ -115,7 +115,7 @@ (name "ryan") (comment "Ryan") (group "users") - (shell (file-append fish "/bin/fish")) + ;(shell (file-append zsh "/bin/zsh")) (home-directory "/home/ryan") (supplementary-groups '("wheel" "netdev" "audio" "video" "lp" "plugdev" "docker" "libvirt" "kvm" "dialout"))) %base-user-accounts)) -- cgit v1.2.3