diff --git a/home/default.nix b/home/default.nix index de8bf9c..f476089 100644 --- a/home/default.nix +++ b/home/default.nix @@ -23,14 +23,14 @@ programs.ssh = { enable = true; extraConfig = '' - Host sutakku - HostName 192.168.1.72 - User oh - IdentityFile /home/notoh/.ssh/sutakku Host sakura HostName 192.168.1.25 User notoh IdentityFile /home/notoh/.ssh/sakura + Host kariru + HostName 192.168.1.54 + User notoh + IdentityFile /home/notoh/.ssh/kariru Host pihole Hostname 192.168.1.221 User root @@ -39,6 +39,7 @@ User root ''; }; + programs.bat = { enable = true; config = { @@ -54,6 +55,7 @@ + "/Catppuccin-mocha.tmTheme"); }; }; + programs.zoxide = { enable = true; enableNushellIntegration = true; diff --git a/hosts/default.nix b/hosts/default.nix index e089abd..492c0e6 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -29,27 +29,6 @@ in { } ]; }; - sutakku = nixosSystem { - inherit system; - specialArgs = {inherit inputs;}; - modules = [ - ./sutakku - sopsModule - diskoModule - hmModule - { - home-manager = { - useGlobalPkgs = true; - useUserPackages = true; - users.oh = { - imports = [ - ./sutakku/home.nix - ]; - }; - }; - } - ]; - }; sakura = nixosSystem { inherit system; specialArgs = {inherit inputs;}; diff --git a/hosts/deploy.nix b/hosts/deploy.nix index de0bfab..cb10171 100644 --- a/hosts/deploy.nix +++ b/hosts/deploy.nix @@ -1,15 +1,5 @@ inputs: { nodes = with inputs.deploy-rs.lib.x86_64-linux; { - sutakku = { - hostname = "sutakku"; - profiles.system = { - user = "root"; - path = activate.nixos inputs.self.nixosConfigurations.sutakku; - }; - sshUser = "oh"; - sshOpts = ["-t" "-i" "~/.ssh/sutakku"]; - magicRollback = false; - }; sakura = { hostname = "sakura"; profiles.system = { diff --git a/hosts/sutakku/default.nix b/hosts/sutakku/default.nix deleted file mode 100644 index 4c7731a..0000000 --- a/hosts/sutakku/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ - config, - pkgs, - ... -}: { - imports = [ - ./hardware-configuration.nix - ../../modules - ../../modules/services/arr - ]; - - boot.loader = { - grub = { - enable = true; - configurationLimit = 3; - device = "/dev/sda"; - useOSProber = false; - }; - }; - - networking = { - hostName = "sutakku"; - }; - - services.xserver = { - layout = "us"; - xkbVariant = ""; - }; - - users = { - defaultUserShell = pkgs.nushell; - users.oh = { - isNormalUser = true; - description = "oh"; - extraGroups = ["networkmanager" "wheel" "docker"]; - }; - }; - - programs.gnupg.agent = { - enable = true; - enableSSHSupport = true; - pinentryFlavor = "curses"; - }; -} diff --git a/hosts/sutakku/hardware-configuration.nix b/hosts/sutakku/hardware-configuration.nix deleted file mode 100644 index fc24e3d..0000000 --- a/hosts/sutakku/hardware-configuration.nix +++ /dev/null @@ -1,42 +0,0 @@ -# Do not modify this file! It was generated by ‘nixos-generate-config’ -# and may be overwritten by future invocations. Please make changes -# to /etc/nixos/configuration.nix instead. -{ - config, - lib, - pkgs, - modulesPath, - ... -}: { - imports = [ - (modulesPath + "/profiles/qemu-guest.nix") - ]; - - boot.initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod"]; - boot.initrd.kernelModules = []; - boot.kernelModules = []; - boot.extraModulePackages = []; - - fileSystems."/" = { - device = "/dev/disk/by-uuid/dae21f73-2c6b-4959-90cc-07fb77c2a880"; - fsType = "ext4"; - }; - fileSystems."/media" = { - device = "192.168.1.71:/volume1/media"; - fsType = "nfs"; - }; - - swapDevices = [ - {device = "/dev/disk/by-uuid/990dd47b-fa78-4636-844e-83cc638052dc";} - ]; - - # Enables DHCP on each ethernet and wireless interface. In case of scripted networking - # (the default) this is the recommended approach. When using systemd-networkd it's - # still possible to use this option, but it's recommended to use it in conjunction - # with explicit per-interface declarations with `networking.interfaces..useDHCP`. - networking.useDHCP = lib.mkDefault true; - # networking.interfaces.ens18.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -} diff --git a/hosts/sutakku/home.nix b/hosts/sutakku/home.nix deleted file mode 100644 index bcd76a0..0000000 --- a/hosts/sutakku/home.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ - config, - pkgs, - ... -}: { - imports = [ - ../../home - ]; - - systemd.user.startServices = "sd-switch"; - programs.home-manager.enable = true; - - home = { - username = "oh"; - homeDirectory = "/home/oh"; - stateVersion = "23.05"; - }; -}