diff --git a/flake.nix b/flake.nix index ee254b4..4ea53e4 100644 --- a/flake.nix +++ b/flake.nix @@ -40,12 +40,12 @@ outputs = { nixpkgs, home-manager, sops-nix, niri, dms, dms-plugin-registry, danksearch, wvkbd-src, ... }@inputs: { nixosConfigurations = { - thinkpad = nixpkgs.lib.nixosSystem { + violet = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = { inherit inputs; }; modules = [ - ./hosts/thinkpad/default.nix + ./hosts/violet/default.nix niri.nixosModules.niri dms-plugin-registry.nixosModules.default @@ -67,6 +67,31 @@ ]; }; + lavender = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + specialArgs = { inherit inputs; }; + + modules = [ + ./hosts/lavender/default.nix + + niri.nixosModules.niri + dms-plugin-registry.nixosModules.default + sops-nix.nixosModules.sops + + home-manager.nixosModules.home-manager { + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.extraSpecialArgs = { inherit inputs; }; + + home-manager.users.jashton = { + imports = [ + ./home/jashton.nix + danksearch.homeModules.default + ]; + }; + } + ]; + }; }; }; } diff --git a/home/desktop/niri.nix b/home/desktop/niri.nix index c081a86..7d421cc 100644 --- a/home/desktop/niri.nix +++ b/home/desktop/niri.nix @@ -95,22 +95,6 @@ in draw-border-with-background = true; clip-to-geometry = true; } - { - matches = [ - { - app-id = "google-chrome"; - title = "^Picture-in-Picture$"; - } - ]; - open-floating = true; - default-column-width = { fixed = 480; }; - default-window-height = { fixed = 270; }; - default-floating-position = { - x = 32; - y = 32; - relative-to = "bottom-left"; - }; - } ]; # Vim Keybindings & Built-in Features diff --git a/home/jashton.nix b/home/jashton.nix index adee413..9279b1e 100644 --- a/home/jashton.nix +++ b/home/jashton.nix @@ -40,24 +40,17 @@ in }; home.packages = with pkgs; [ - aider-chat - animdl antigravity asciinema discord ffmpeg - freetube gemini-cli - intelli-shell - jrnl libreoffice mc opencode pdftk scrot - steam spotify - tailscale vlc wtype xwayland-satellite diff --git a/hosts/lavender/default.nix b/hosts/lavender/default.nix new file mode 100644 index 0000000..73d5368 --- /dev/null +++ b/hosts/lavender/default.nix @@ -0,0 +1,12 @@ +{ config, pkgs, ... }: + +{ + imports = [ + ./hardware.nix + ../../system + ]; + + networking.hostName = "violet"; + + system.stateVersion = "26.05"; +} diff --git a/hosts/lavender/hardware.nix b/hosts/lavender/hardware.nix new file mode 100644 index 0000000..188dd26 --- /dev/null +++ b/hosts/lavender/hardware.nix @@ -0,0 +1,33 @@ +# 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 + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/2fc352b4-3b86-4282-9eb8-0bcaf6d48cd1"; + fsType = "ext4"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/0CB6-7449"; + fsType = "vfat"; + options = [ "fmask=0022" "dmask=0022" ]; + }; + + swapDevices = + [ { device = "/dev/disk/by-uuid/8f8fdc73-d963-4665-b7e4-28eb43958ebe"; } + ]; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/hosts/thinkpad/default.nix b/hosts/violet/default.nix similarity index 85% rename from hosts/thinkpad/default.nix rename to hosts/violet/default.nix index eac493b..db6f008 100644 --- a/hosts/thinkpad/default.nix +++ b/hosts/violet/default.nix @@ -7,7 +7,7 @@ ../../system/security/thinkpad.nix ]; - networking.hostName = "nix-pad"; + networking.hostName = "lavender"; services.power-profiles-daemon.enable = false; diff --git a/hosts/thinkpad/hardware.nix b/hosts/violet/hardware.nix similarity index 100% rename from hosts/thinkpad/hardware.nix rename to hosts/violet/hardware.nix diff --git a/system/core/boot.nix b/system/core/boot.nix index 11b0c43..6beae4c 100644 --- a/system/core/boot.nix +++ b/system/core/boot.nix @@ -5,6 +5,6 @@ boot.loader.efi.canTouchEfiVariables = true; boot.kernelPackages = pkgs.linuxPackages_latest; boot.kernelModules = [ "uinput" ]; - system.nixos.label = "niri-v.1.1"; + system.nixos.label = "niri-v.1.2"; environment.pathsToLink = [ "/libexec" ]; } diff --git a/system/core/env.nix b/system/core/env.nix index 0c71d6a..5f1d5e7 100644 --- a/system/core/env.nix +++ b/system/core/env.nix @@ -33,7 +33,6 @@ ehome = "nvim $HOME/.dotfiles/home/jashton.nix"; l = "ls -la"; ports = "cat $HOME/.dotfiles/ports.registry"; - accentum = "bluetoothctl connect 80:C3:BA:50:43:DF"; }; ohMyZsh = { @@ -43,12 +42,5 @@ "git" ]; }; - - interactiveShellInit = '' - if [ -f "/run/secrets/vaultwarden_clientid" ]; then - export BW_CLIENTID=$(cat /run/secrets/vaultwarden_clientid) - export BW_CLIENTSECRET=$(cat /run/secrets/vaultwarden_clientsecret) - fi - ''; }; } diff --git a/system/packages.nix b/system/packages.nix index 101795f..32267cd 100644 --- a/system/packages.nix +++ b/system/packages.nix @@ -28,9 +28,7 @@ networkmanagerapplet nitrogen ollama - (pass.withExtensions (exts: [ exts.pass-import ])) pasystray - picom pulseaudioFull rnote sops @@ -52,10 +50,11 @@ DOTFILES="$HOME/.dotfiles" ERRFILE=$(mktemp) + HOST=$(cat /etc/hostname) trap "rm -f '$ERRFILE'" EXIT echo "Building NixOS..." - sudo nixos-rebuild switch --flake "$DOTFILES#thinkpad" 2>&1 | tee "$ERRFILE" + sudo nixos-rebuild switch --flake "$DOTFILES#$HOST" 2>&1 | tee "$ERRFILE" STATUS=''${PIPESTATUS[0]} if [ "$STATUS" -ne 0 ]; then @@ -82,14 +81,23 @@ read -r msg_to_append ${pkgs.git}/bin/git add -A - ${pkgs.git}/bin/git commit -m "nixos: gen $GEN @ $(hostname) — $TIMESTAMP -$VER - -$msg_to_append" + ${pkgs.git}/bin/git commit -m "nixos: gen $GEN @ $(hostname) — $TIMESTAMP $VER ----- $msg_to_append" ${pkgs.git}/bin/git push '') ]; programs.firefox.enable = true; programs.thunar.enable = true; + + hardware.graphics = { + enable = true; + enable32Bit = true; + }; + + programs.steam = { + enable = true; + remotePlay.openFirewall = true; + dedicatedServer.openFirewall = true; + localNetworkGameTransfers.openFirewall = true; + }; }