diff --git a/hosts/cave/rtl-sdr.nix b/common/hardware/rtl-sdr.nix similarity index 100% rename from hosts/cave/rtl-sdr.nix rename to common/hardware/rtl-sdr.nix diff --git a/flake.lock b/flake.lock index 5095d06..f0270a3 100644 --- a/flake.lock +++ b/flake.lock @@ -1014,11 +1014,11 @@ ] }, "locked": { - "lastModified": 1739802346, + "lastModified": 1739802768, "narHash": "sha256-XWlyntinwVTGKpYdazym6nEeCD43bcK+Zi52zkgY+hE=", "ref": "refs/heads/main", - "rev": "6004f9ad5dca2bbfd3ca55708b0c571f8e96d1e1", - "revCount": 87, + "rev": "dba87a3e6c54e8a1919dcd0fa6d0f5f76aa43f3f", + "revCount": 89, "type": "git", "url": "https://git.vulpecula.zone/tasiaiso/tasiaiso.vulpecula.zone" }, @@ -1137,11 +1137,11 @@ ] }, "locked": { - "lastModified": 1739134002, - "narHash": "sha256-ZLAvn+PkHHel6cUmaxLNwGzM6T63cwwjbQpCgoUce7E=", + "lastModified": 1739802918, + "narHash": "sha256-qcXYcRnw79yhUSJcdC6olV8/cVnnYiRfjV+MmY6oLuc=", "ref": "refs/heads/main", - "rev": "f695998f63e84a35cfdadcebac4945be6a0607bd", - "revCount": 15, + "rev": "5aa5467c71be603812df08368d5f47bbea10753d", + "revCount": 17, "type": "git", "url": "https://git.vulpecula.zone/tasiaiso/vulpecula.zone" }, diff --git a/home/tasia.nix b/home/tasia.nix index 2023274..2f76f38 100644 --- a/home/tasia.nix +++ b/home/tasia.nix @@ -25,22 +25,22 @@ home-manager.users.tasia = {pkgs, ...}: { home = { file = { - ".zshrc".source = ../../dotfiles/.zshrc; - ".bashrc".source = ../../dotfiles/.bashrc; - ".shellrc".source = ../../dotfiles/.shellrc; + ".zshrc".source = ../dotfiles/.zshrc; + ".bashrc".source = ../dotfiles/.bashrc; + ".shellrc".source = ../dotfiles/.shellrc; - ".config/btop/btop.conf".source = ../../dotfiles/btop.conf; - ".gitconfig".source = ../../dotfiles/.gitconfig; + ".config/btop/btop.conf".source = ../dotfiles/btop.conf; + ".gitconfig".source = ../dotfiles/.gitconfig; - ".librewolf/librewolf.overrides.cfg".source = ../../dotfiles/librewolf.overrides.cfg; + ".librewolf/librewolf.overrides.cfg".source = ../dotfiles/librewolf.overrides.cfg; # sway - ".config/fontconfig/conf.d/01-font.conf".source = ../../dotfiles/sway-cave/fontconfig; - ".config/foot/foot.ini".source = ../../dotfiles/sway-cave/foot-config.ini; - ".config/sway/config".source = ../../dotfiles/sway-cave/sway-config; - ".config/swaylock/config".source = ../../dotfiles/sway-cave/swaylock-config; - ".config/waybar/config.jsonc".source = ../../dotfiles/sway-cave/waybar-config.jsonc; - ".config/waybar/style.css".source = ../../dotfiles/sway-cave/waybar-style.css; + ".config/fontconfig/conf.d/01-font.conf".source = ../dotfiles/sway-cave/fontconfig; + ".config/foot/foot.ini".source = ../dotfiles/sway-cave/foot-config.ini; + ".config/sway/config".source = ../dotfiles/sway-cave/sway-config; + ".config/swaylock/config".source = ../dotfiles/sway-cave/swaylock-config; + ".config/waybar/config.jsonc".source = ../dotfiles/sway-cave/waybar-config.jsonc; + ".config/waybar/style.css".source = ../dotfiles/sway-cave/waybar-style.css; }; shellAliases = { diff --git a/hosts/cave/configuration.nix b/hosts/cave/configuration.nix index 1cba34e..726242a 100644 --- a/hosts/cave/configuration.nix +++ b/hosts/cave/configuration.nix @@ -51,7 +51,7 @@ in { # Personal modules # ../../modules/nixos/tildefriends.nix ./yubikey.nix - ./rtl-sdr.nix + ../../common/hardware/rtl-sdr.nix ]; networking = { diff --git a/hosts/jo/configuration.nix b/hosts/jo/configuration.nix index afe77af..fa000e8 100644 --- a/hosts/jo/configuration.nix +++ b/hosts/jo/configuration.nix @@ -42,7 +42,7 @@ in { ../../common/services/autoupgrade.nix # Home-manager - ../../home/tasia/home.nix + ../../home/tasia.nix inputs.agenix.nixosModules.default ../../common/components/wifi-secrets.nix @@ -51,9 +51,9 @@ in { # Personal modules # ../../modules/nixos/tildefriends.nix # ./yubikey.nix - ./rtl-sdr.nix + ../../common/hardware/rtl-sdr.nix ]; - + # Bootloader. boot.loader.systemd-boot.enable = lib.mkForce false; boot.loader.grub.enable = true;