diff options
Diffstat (limited to 'nix_archive')
| -rw-r--r-- | nix_archive/flake.lock | 24 | ||||
| -rw-r--r-- | nix_archive/hosts/palm/configuration.nix | 6 | ||||
| -rw-r--r-- | nix_archive/hosts/palm/programs.nix | 1 | ||||
| -rw-r--r-- | nix_archive/nix/programs/foot.nix | 4 | ||||
| -rw-r--r-- | nix_archive/nix/programs/nvim.nix | 4 | ||||
| -rw-r--r-- | nix_archive/nix/programs/sway.nix | 11 | ||||
| -rw-r--r-- | nix_archive/nix/user.nix | 3 |
7 files changed, 29 insertions, 24 deletions
diff --git a/nix_archive/flake.lock b/nix_archive/flake.lock index fe48dda..e6f1be2 100644 --- a/nix_archive/flake.lock +++ b/nix_archive/flake.lock @@ -90,11 +90,11 @@ ] }, "locked": { - "lastModified": 1772218752, - "narHash": "sha256-G8nArvOTZXU8DRvrzAdz3Elcj6kA/vMtvY9mrGLATtA=", + "lastModified": 1775900011, + "narHash": "sha256-QUGu6CJYFQ5AWVV0n3/FsJyV+1/gj7HSDx68/SX9pwM=", "owner": "nix-community", "repo": "home-manager", - "rev": "f3a30376bb9eb2f6f61816be7d6ed954b6d2a3b9", + "rev": "b0569dc6ec1e6e7fefd8f6897184e4c191cd768e", "type": "github" }, "original": { @@ -144,11 +144,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1771969195, - "narHash": "sha256-qwcDBtrRvJbrrnv1lf/pREQi8t2hWZxVAyeMo7/E9sw=", + "lastModified": 1775490113, + "narHash": "sha256-2ZBhDNZZwYkRmefK5XLOusCJHnoeKkoN95hoSGgMxWM=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "41c6b421bdc301b2624486e11905c9af7b8ec68e", + "rev": "c775c2772ba56e906cbeb4e0b2db19079ef11ff7", "type": "github" }, "original": { @@ -211,11 +211,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1771848320, - "narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=", + "lastModified": 1775710090, + "narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2fc6539b481e1d2569f25f8799236694180c0993", + "rev": "4c1018dae018162ec878d42fec712642d214fdfa", "type": "github" }, "original": { @@ -233,11 +233,11 @@ ] }, "locked": { - "lastModified": 1772294246, - "narHash": "sha256-Y6khA3BzerdT3mBN/s/Tt246CJTo1OTMMBUW1POAAms=", + "lastModified": 1775915587, + "narHash": "sha256-PqdaOIG8DuUoIp/pp0nPf60IEsaQE62DLCuxYtOHaSQ=", "owner": "nix-community", "repo": "NUR", - "rev": "3b952378a6cdbc6fe8840ff87ce7c10066b59b08", + "rev": "78a0c668489f23b75253fdef25d844533ac0ef8b", "type": "github" }, "original": { diff --git a/nix_archive/hosts/palm/configuration.nix b/nix_archive/hosts/palm/configuration.nix index c91ef72..9fd4ebc 100644 --- a/nix_archive/hosts/palm/configuration.nix +++ b/nix_archive/hosts/palm/configuration.nix @@ -18,7 +18,7 @@ in { ../../nix/programs/bash.nix ../../nix/programs/nvim.nix ../../nix/programs/sway.nix - ../../nix/programs/kitty.nix + ../../nix/programs/foot.nix ../../nix/programs/firefox.nix ../../nix/programs/obs.nix ../../nix/programs/waydroid.nix @@ -112,7 +112,6 @@ in { STOP_CHARGE_THRESH_BAT0 = 85; }; }; - programs.light.enable = true; networking = { hostName = "palm"; @@ -154,8 +153,9 @@ in { }; environment.systemPackages = with pkgs; [ - linuxPackages_latest.perf + perf linuxPackages_latest.cpupower + brightnessctl (pkgs.writeShellScriptBin "run-sway" '' export WLR_RENDERER=vulkan export WLR_DRM_DEVICES=/dev/dri/card1 diff --git a/nix_archive/hosts/palm/programs.nix b/nix_archive/hosts/palm/programs.nix index 40c3af1..c3161b3 100644 --- a/nix_archive/hosts/palm/programs.nix +++ b/nix_archive/hosts/palm/programs.nix @@ -7,6 +7,7 @@ (asNeeded "imv" ["imv"]) (asNeeded "mpv" ["mpv"]) (asNeeded "steam-run" ["steam-run"]) + (asNeeded "moonlight-qt" ["moonlight-qt"]) # camu # camu-devshell # mauri diff --git a/nix_archive/nix/programs/foot.nix b/nix_archive/nix/programs/foot.nix index 5c85ce7..5a322eb 100644 --- a/nix_archive/nix/programs/foot.nix +++ b/nix_archive/nix/programs/foot.nix @@ -12,9 +12,9 @@ in { server.enable = true; settings = { main = { - font = "${s.font.name}:size=${toString s.font.size}"; + font = "${loc.font.name}:size=${toString loc.font.size}"; }; - colors = { + colors-dark = { foreground = "${colo.foreground}"; background = "${colo.background}"; regular0 = "${colo.color0}"; diff --git a/nix_archive/nix/programs/nvim.nix b/nix_archive/nix/programs/nvim.nix index 3cdf12e..2d36e64 100644 --- a/nix_archive/nix/programs/nvim.nix +++ b/nix_archive/nix/programs/nvim.nix @@ -215,11 +215,13 @@ in { # }; # meta.homepage = ""; #}) + withRuby = false; + withPython = false; plugins = with pkgs.vimPlugins; [ local-nvim wal undotree - fzfWrapper + fzf-wrapper fzf-vim vim-gitbranch vim-signify diff --git a/nix_archive/nix/programs/sway.nix b/nix_archive/nix/programs/sway.nix index b5dcb5f..1fa762a 100644 --- a/nix_archive/nix/programs/sway.nix +++ b/nix_archive/nix/programs/sway.nix @@ -18,10 +18,10 @@ in { grim wf-recorder wlsunset - xorg.xprop - xorg.xset - xorg.xrdb - xorg.xrandr + xprop + xset + xrdb + xrandr ]; }; local.scripts.imports = [ @@ -141,12 +141,13 @@ in { ''; extraCss4 = '' ''; - in { + in rec { enable = true; theme = { name = "adw-gtk3" + (if colo.lightness == "light" then "" else "-dark"); package = pkgs.adw-gtk3; }; + gtk4.theme = theme; cursorTheme = { name = "WhiteSur-cursors"; }; diff --git a/nix_archive/nix/user.nix b/nix_archive/nix/user.nix index 360f53d..7dd53cc 100644 --- a/nix_archive/nix/user.nix +++ b/nix_archive/nix/user.nix @@ -67,7 +67,6 @@ in { rsync (python3.withPackages (python-pkgs: [ python-pkgs.requests python-pkgs.beautifulsoup4 ])) htop - neofetch ufetch (asNeeded "cmatrix" ["cmatrix"]) hdparm @@ -154,6 +153,7 @@ in { home.username = "andrew"; xdg.userDirs = { enable = true; + setSessionVariables = true; desktop = "${homeDir}/tmp"; documents = "${homeDir}/docs"; download = "${homeDir}/dl"; @@ -179,6 +179,7 @@ in { signing = { key = "99659CB58598BDDB"; # The last digits of the key. signByDefault = true; + format = "openpgp"; }; }; home.file.".config/gdb/gdbinit".source = ../../files/gdbinit; |