From 1ce15710a125371e7747f4df56c3a6bfc0e85bb6 Mon Sep 17 00:00:00 2001 From: alejandro-angulo Date: Wed, 23 Apr 2025 16:12:32 -0700 Subject: [PATCH] Misc updates --- flake.lock | 254 ++++-------------- flake.nix | 2 +- modules/home/programs/k9s/default.nix | 8 +- modules/home/programs/neovim/default.nix | 4 - modules/home/windowManagers/sway/default.nix | 41 ++- modules/nixos/nix/default.nix | 2 +- .../nixos/services/homeassistant/default.nix | 1 + systems/x86_64-linux/carbon/default.nix | 2 +- systems/x86_64-linux/gospel/default.nix | 24 +- 9 files changed, 108 insertions(+), 230 deletions(-) diff --git a/flake.lock b/flake.lock index e0b87b2..a0de3ab 100644 --- a/flake.lock +++ b/flake.lock @@ -30,11 +30,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1741732420, - "narHash": "sha256-szO/TCc+UrjEtxi4K3GyoAv5/DKDkUeRtpTZTJY+zI4=", + "lastModified": 1745352209, + "narHash": "sha256-u3vJEzi6zxgG59KXjMR5koERsdKT5nd1OEKCpr6zgn8=", "owner": "catppuccin", "repo": "nix", - "rev": "a3f70463fb5e3df32d2d52a2705606db03843de2", + "rev": "6268e50dbb0ac9375e110560395b5dc199e4dfb8", "type": "github" }, "original": { @@ -65,28 +65,6 @@ "type": "github" } }, - "devshell": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1735644329, - "narHash": "sha256-tO3HrHriyLvipc4xr+Ewtdlo7wM1OjXNjlWRgmM7peY=", - "owner": "numtide", - "repo": "devshell", - "rev": "f7795ede5b02664b57035b3b757876703e2c3eac", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, "flake-compat": { "flake": false, "locked": { @@ -104,20 +82,6 @@ } }, "flake-compat_2": { - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "revCount": 57, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" - } - }, - "flake-compat_3": { "flake": false, "locked": { "lastModified": 1650374568, @@ -138,11 +102,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1736143030, - "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=", + "lastModified": 1741352980, + "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de", + "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", "type": "github" }, "original": { @@ -160,11 +124,11 @@ ] }, "locked": { - "lastModified": 1736143030, - "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=", + "lastModified": 1741352980, + "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de", + "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", "type": "github" }, "original": { @@ -228,57 +192,6 @@ "type": "github" } }, - "git-hooks": { - "inputs": { - "flake-compat": [ - "nixvim", - "nixvim", - "flake-compat" - ], - "gitignore": "gitignore", - "nixpkgs": [ - "nixvim", - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1737043064, - "narHash": "sha256-I/OuxGwXwRi5gnFPsyCvVR+IfFstA+QXEpHu1hvsgD8=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "94ee657f6032d913fe0ef49adaa743804635b0bb", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, - "gitignore": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixvim", - "git-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -286,11 +199,11 @@ ] }, "locked": { - "lastModified": 1741701235, - "narHash": "sha256-gBlb8R9gnjUAT5XabJeel3C2iEUiBHx3+91651y3Sqo=", + "lastModified": 1745362344, + "narHash": "sha256-R4d7j2urn/W+K9crKJaxJvZOsVX5v7uCAymaDBq97SE=", "owner": "nix-community", "repo": "home-manager", - "rev": "c630dfa8abcc65984cc1e47fb25d4552c81dd37e", + "rev": "b99e3e46b86aefc01f229e0a29d0c03c1079aaed", "type": "github" }, "original": { @@ -300,28 +213,6 @@ "type": "github" } }, - "home-manager_2": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1737075266, - "narHash": "sha256-u1gk5I1an975FOAMMdS6oBKnSIsZza5ZKhaeBZAskVo=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "12851ae7467bad8ef422b20806ab4d6d81e12d29", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, "ixx": { "inputs": { "flake-utils": [ @@ -352,28 +243,6 @@ "type": "github" } }, - "nix-darwin": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1736819234, - "narHash": "sha256-deQVtIH4UJueELJqluAICUtX7OosD9paTP+5FgbiSwI=", - "owner": "lnl7", - "repo": "nix-darwin", - "rev": "bd921223ba7cdac346477d7ea5204d6f4736fcc6", - "type": "github" - }, - "original": { - "owner": "lnl7", - "repo": "nix-darwin", - "type": "github" - } - }, "nixlib": { "locked": { "lastModified": 1736643958, @@ -397,11 +266,11 @@ ] }, "locked": { - "lastModified": 1740947705, - "narHash": "sha256-Co2kAD2SZalOm+5zoxmzEVZNvZ17TyafuFsD46BwSdY=", + "lastModified": 1742568034, + "narHash": "sha256-QaMEhcnscfF2MqB7flZr+sLJMMYZPnvqO4NYf9B4G38=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "507911df8c35939050ae324caccc7cf4ffb76565", + "rev": "42ee229088490e3777ed7d1162cb9e9d8c3dbb11", "type": "github" }, "original": { @@ -412,11 +281,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1741325094, - "narHash": "sha256-RUAdT8dZ6k/486vnu3tiNRrNW6+Q8uSD2Mq7gTX4jlo=", + "lastModified": 1744633460, + "narHash": "sha256-fbWE4Xpw6eH0Q6in+ymNuDwTkqmFmtxcQEmtRuKDTTk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "b48cc4dab0f9711af296fc367b6108cf7b8ccb16", + "rev": "9a049b4a421076d27fee3eec664a18b2066824cb", "type": "github" }, "original": { @@ -428,11 +297,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1741246872, - "narHash": "sha256-Q6pMP4a9ed636qilcYX8XUguvKl/0/LGXhHcRI91p0U=", + "lastModified": 1744463964, + "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "10069ef4cf863633f57238f179a0297de84bd8d3", + "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", "type": "github" }, "original": { @@ -444,23 +313,26 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1735774519, - "narHash": "sha256-CewEm1o2eVAnoqb6Ml+Qi9Gg/EfNAxbRx1lANGVyoLI=", - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz" + "lastModified": 1740877520, + "narHash": "sha256-oiwv/ZK/2FhGxrCkQkB83i7GnWXPPLzoqFHpDD3uYpk=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "147dee35aab2193b174e4c0868bd80ead5ce755c", + "type": "github" }, "original": { - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz" + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" } }, "nixpkgs_2": { "locked": { - "lastModified": 1741513245, - "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=", + "lastModified": 1745234285, + "narHash": "sha256-GfpyMzxwkfgRVN0cTGQSkTC0OHhEkv3Jf6Tcjm//qZ0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1", + "rev": "c11863f1e964833214b767f4a369c6e6a7aba141", "type": "github" }, "original": { @@ -472,16 +344,16 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1736883708, - "narHash": "sha256-uQ+NQ0/xYU0N1CnXsa2zghgNaOPxWpMJXSUJJ9W7140=", + "lastModified": 1742272065, + "narHash": "sha256-ud8vcSzJsZ/CK+r8/v0lyf4yUntVmDq6Z0A41ODfWbE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "eb62e6aa39ea67e0b8018ba8ea077efe65807dc8", + "rev": "3549532663732bfd89993204d40543e9edaec4f2", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } @@ -495,11 +367,11 @@ "nixvim": "nixvim_2" }, "locked": { - "lastModified": 1737218143, - "narHash": "sha256-HK4WUK3rP0i0N64UM8leZ5Y79D6cdurwfIxsSc3QG6E=", + "lastModified": 1742512926, + "narHash": "sha256-p7xq1+ejbpUwI1BH5XScd6lS0iFfRQ9cjZCG52NVaec=", "ref": "main", - "rev": "2816e7ff551ed51e4df90070570f59deefdf3d11", - "revCount": 44, + "rev": "cb6de13cc75098ec657f22e75d733c20e1ff71bd", + "revCount": 46, "type": "git", "url": "https://git.alejandr0angul0.dev/alejandro-angulo/nixvim-config" }, @@ -511,22 +383,16 @@ }, "nixvim_2": { "inputs": { - "devshell": "devshell", - "flake-compat": "flake-compat_2", "flake-parts": "flake-parts_2", - "git-hooks": "git-hooks", - "home-manager": "home-manager_2", - "nix-darwin": "nix-darwin", "nixpkgs": "nixpkgs_3", - "nuschtosSearch": "nuschtosSearch", - "treefmt-nix": "treefmt-nix" + "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1737200978, - "narHash": "sha256-QTUx/F8HVjrRIHQxHKrr72aPMj+cDk18WTbvBCCBBdI=", + "lastModified": 1742488644, + "narHash": "sha256-vXpu7G4aupNCPlv8kAo7Y/jocfSUwglkvNx5cR0XjBo=", "owner": "nix-community", "repo": "nixvim", - "rev": "cbf960e5659054b2ccf27b67218782e69016bef5", + "rev": "d44b33a1ea1a3e584a8c93164dbe0ba2ad4f3a13", "type": "github" }, "original": { @@ -546,11 +412,11 @@ ] }, "locked": { - "lastModified": 1735854821, - "narHash": "sha256-Iv59gMDZajNfezTO0Fw6LHE7uKAShxbvMidmZREit7c=", + "lastModified": 1741886583, + "narHash": "sha256-sScfYKtxp3CYv5fJcHQDvQjqBL+tPNQqS9yf9Putd+s=", "owner": "NuschtOS", "repo": "search", - "rev": "836908e3bddd837ae0f13e215dd48767aee355f0", + "rev": "2974bc5fa3441a319fba943f3ca41f7dcd1a1467", "type": "github" }, "original": { @@ -593,7 +459,7 @@ }, "snowfall-lib": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_2", "flake-utils-plus": "flake-utils-plus", "nixpkgs": [ "nixpkgs" @@ -673,28 +539,6 @@ "type": "github" } }, - "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1737054102, - "narHash": "sha256-saLiCRQ5RtdTnznT/fja7GxcYRAzeY3k8S+IF/2s/2A=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "97871d416166803134ba64597a1006f3f670fbde", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, "utils": { "inputs": { "systems": "systems_2" diff --git a/flake.nix b/flake.nix index c7c5a1a..180fdac 100644 --- a/flake.nix +++ b/flake.nix @@ -52,7 +52,7 @@ home-manager.nixosModules.home-manager ]; - homes.modules = with inputs; [ catppuccin.homeManagerModules.catppuccin ]; + homes.modules = with inputs; [ catppuccin.homeModules.catppuccin ]; deploy.nodes = { node = { diff --git a/modules/home/programs/k9s/default.nix b/modules/home/programs/k9s/default.nix index 8472992..278dfec 100644 --- a/modules/home/programs/k9s/default.nix +++ b/modules/home/programs/k9s/default.nix @@ -13,12 +13,10 @@ in }; config = lib.mkIf cfg.enable { - programs.k9s = { + programs.k9s.enable = true; + catppuccin.k9s = { enable = true; - catppuccin = { - enable = true; - transparent = true; - }; + transparent = true; }; }; } diff --git a/modules/home/programs/neovim/default.nix b/modules/home/programs/neovim/default.nix index 859d389..eced169 100644 --- a/modules/home/programs/neovim/default.nix +++ b/modules/home/programs/neovim/default.nix @@ -27,10 +27,6 @@ in lib.mkMerge [ { home.packages = [ pkgs.neovim ]; } (lib.mkIf cfg.lazygit.enable { - programs.zsh.shellAliases = { - nvim = "${pkgs.neovim}/bin/nvim --listen /tmp/nvim-server.pipe"; - }; - programs.lazygit.settings.os = { editCommand = "nvim"; editCommandTemplate = '' diff --git a/modules/home/windowManagers/sway/default.nix b/modules/home/windowManagers/sway/default.nix index 4aa2c5b..8139ac4 100644 --- a/modules/home/windowManagers/sway/default.nix +++ b/modules/home/windowManagers/sway/default.nix @@ -121,16 +121,26 @@ in apply = true; }; + # TODO: configure xdg portal with home-manager (it's broken rn) + # see here: https://github.com/nix-community/home-manager/issues/6770 + # # For screen sharing to work - xdg.portal = { - enable = true; - extraPortals = with pkgs; [ - xdg-desktop-portal-wlr - xdg-desktop-portal-gtk - ]; - config.common.default = "*"; - }; - + # home.sessionVariables.NIX_XDG_DESKTOP_PORTAL_DIR = ""; + # systemd.user.sessionVariables.NIX_XDG_DESKTOP_PORTAL_DIR = ""; + # xdg.portal = { + # enable = true; + # extraPortals = with pkgs; [ + # xdg-desktop-portal-wlr + # xdg-desktop-portal-gtk + # ]; + # config = { + # common = { + # default = "gtk"; + # "org.freekdesktop.impl.portal.ScreenCast" = "wlr"; + # "org.freekdesktop.impl.portal.ScreenShot" = "wlr"; + # }; + # }; + # }; xdg.dataFile.${cfg.wallpaperPath}.source = ./wallpaper.jpg; catppuccin.sway.enable = true; @@ -159,11 +169,18 @@ in ; workspaceAutoBackAndForth = true; - startup = mkIf cfg.clamshell.enable [ - { + startup = lib.mkMerge [ + (mkIf cfg.clamshell.enable { command = "${clamshell_script}/bin/clamshell"; always = true; - } + }) + # Trying to copy what arch linux does + [ + # { command = "systemctl --user set-environment WAYLAND_DISPLAY=wayland-1 XDG_CURRENT_DESKTOP=sway"; } + { + command = "systemctl --user import-environment DISPLAY SWAYSOCK WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"; + } + ] ]; # Use catppuccin colors diff --git a/modules/nixos/nix/default.nix b/modules/nixos/nix/default.nix index 539b4e7..cebeecd 100644 --- a/modules/nixos/nix/default.nix +++ b/modules/nixos/nix/default.nix @@ -20,7 +20,7 @@ in enable = mkEnableOption "manage nix configuration."; package = mkOption { type = types.package; - default = pkgs.nixVersions.git; + default = pkgs.nixVersions.latest; description = "Which nix package to use."; }; diff --git a/modules/nixos/services/homeassistant/default.nix b/modules/nixos/services/homeassistant/default.nix index 366d9c0..1b218d0 100644 --- a/modules/nixos/services/homeassistant/default.nix +++ b/modules/nixos/services/homeassistant/default.nix @@ -54,6 +54,7 @@ in "met" "mqtt" "octoprint" + "roborock" "shelly" "zeroconf" ]; diff --git a/systems/x86_64-linux/carbon/default.nix b/systems/x86_64-linux/carbon/default.nix index 36a304a..89667dd 100644 --- a/systems/x86_64-linux/carbon/default.nix +++ b/systems/x86_64-linux/carbon/default.nix @@ -60,7 +60,7 @@ hugo nixos-generators vlc - signal-desktop + signal-desktop-bin ]; programs.light.enable = true; diff --git a/systems/x86_64-linux/gospel/default.nix b/systems/x86_64-linux/gospel/default.nix index 21e508a..dfcee6d 100644 --- a/systems/x86_64-linux/gospel/default.nix +++ b/systems/x86_64-linux/gospel/default.nix @@ -69,6 +69,8 @@ ]; }; + services.sunshine.enable = true; + services.udev.packages = [ (pkgs.writeTextFile { name = "microbit-udev-rules"; @@ -163,7 +165,7 @@ prusa-slicer esptool minicom - signal-desktop + signal-desktop-bin ncdu cntr @@ -183,6 +185,26 @@ tridactyl-native ]; + # TODO: configure xdg portal with home-manager (it's broken rn) + # see here: https://github.com/nix-community/home-manager/issues/6770 + # + xdg.portal = { + enable = true; + config = { + common = { + default = "wlr"; + }; + }; + wlr.enable = true; + wlr.settings.screencast = { + chooser_type = "simple"; + chooser_cmd = "${pkgs.slurp}/bin/slurp -f %o -or"; + }; + extraPortals = with pkgs; [ + xdg-desktop-portal-gtk # Makes gtk apps happy + ]; + }; + # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions # on your system were taken. It‘s perfectly fine and recommended to leave