From e98d4893f7cf6953ea34015e19d11afa93c830d1 Mon Sep 17 00:00:00 2001 From: rogueking Date: Thu, 11 Sep 2025 02:01:56 -0700 Subject: [PATCH] updated eva-03 --- flake.nix | 9 +++ home-manager/commands/commands.nix | 6 +- home-manager/commands/git.nix | 8 +-- .../commands/nixvim/plugins/default.nix | 3 +- home-manager/programs/hypr/hyprland.nix | 6 +- home-manager/programs/hypr/hyprlock.nix | 4 +- home-manager/programs/rofi/rofi.nix | 2 +- hosts/eva-03/configuration.nix | 56 ++++++++----------- hosts/eva-03/hardware-configuration.nix | 8 +-- 9 files changed, 48 insertions(+), 54 deletions(-) diff --git a/flake.nix b/flake.nix index d66030b..27cef59 100644 --- a/flake.nix +++ b/flake.nix @@ -67,6 +67,15 @@ nixos-hardware.nixosModules.lenovo-thinkpad-x1-nano-gen1 ]; }; + + eva-03 = nixpkgs.lib.nixosSystem { + specialArgs = {inherit inputs pkgs-unstable configPath;} // {hostname = "eva-03";}; + system = system; + modules = [ + ./hosts/eva-03/configuration.nix + inputs.home-manager.nixosModules.default + ]; + }; }; darwinConfigurations = { eva-02 = nix-darwin.lib.darwinSystem{ diff --git a/home-manager/commands/commands.nix b/home-manager/commands/commands.nix index 4d1f7bd..f38efc7 100644 --- a/home-manager/commands/commands.nix +++ b/home-manager/commands/commands.nix @@ -1,5 +1,6 @@ { pkgs, + pkgs-unstable, lib, hostname, ... @@ -48,8 +49,7 @@ openconnect openssl ripgrep - sage - tailscale +# sage termusic timg tldr @@ -110,7 +110,7 @@ # cli parted traceroute - ]; + ]; programs = { ssh = { diff --git a/home-manager/commands/git.nix b/home-manager/commands/git.nix index 300a292..8778f2a 100644 --- a/home-manager/commands/git.nix +++ b/home-manager/commands/git.nix @@ -25,12 +25,8 @@ extraConfig = { gpg = { format = "ssh"; - ssh = { - program = if hostname == "eva-02" - then - "/Applications/1Password.app/Contents/MacOS/op-ssh-sign" - else - "/usr/bin/op-ssh-sign"; + ssh = lib.optionalAttrs (hostname == "eva-02") { + program = "/Applications/1Password.app/Contents/MacOS/op-ssh-sign"; }; }; }; diff --git a/home-manager/commands/nixvim/plugins/default.nix b/home-manager/commands/nixvim/plugins/default.nix index a207720..749f2e8 100644 --- a/home-manager/commands/nixvim/plugins/default.nix +++ b/home-manager/commands/nixvim/plugins/default.nix @@ -17,8 +17,7 @@ ./startup.nix ./telescope.nix ./which-key.nix - ] - ++ lib.optional (hostname != "eva-02") ./codecompanion.nix; + ]; programs.nixvim.plugins = { cmp-nvim-lsp.enable = true; diff --git a/home-manager/programs/hypr/hyprland.nix b/home-manager/programs/hypr/hyprland.nix index 47fbf85..5554481 100644 --- a/home-manager/programs/hypr/hyprland.nix +++ b/home-manager/programs/hypr/hyprland.nix @@ -1,10 +1,10 @@ -{ config, configPath, ... }: +{ config, ... }: { wayland.windowManager.hyprland = { enable = true; settings = { # === Monitor configuration === - monitor = "eDP-1, 1920x1080@60.03300, 0x0, 1.25"; + monitor = "eDP-1, 2560x1440@60.03300, 0x0, 1.25"; # === Autostart / Exec commands === exec-once = [ @@ -13,7 +13,7 @@ "ghostty" "swww-daemon" "eww daemon" - "swww img ${configPath}/assets/ena/wallpaper.png" + #"swww img ${configPath}/assets/ena/wallpaper.png" ]; # === Input settings === diff --git a/home-manager/programs/hypr/hyprlock.nix b/home-manager/programs/hypr/hyprlock.nix index fefbcf6..ebb8ae5 100644 --- a/home-manager/programs/hypr/hyprlock.nix +++ b/home-manager/programs/hypr/hyprlock.nix @@ -11,14 +11,14 @@ }; background = [ { - path = "${configPath}/assets/ena/wallpaper.png"; + #path = "${configPath}/assets/ena/wallpaper.png"; blur_passes = 3; blur_size = 8; } ]; image = [ { - path = "${configPath}/assets/pfp.jpg"; + #path = "${configPath}/assets/pfp.jpg"; size = 150; border_size = 4; border_color = "rgb(0C96F9)"; diff --git a/home-manager/programs/rofi/rofi.nix b/home-manager/programs/rofi/rofi.nix index 88cda2c..001243b 100644 --- a/home-manager/programs/rofi/rofi.nix +++ b/home-manager/programs/rofi/rofi.nix @@ -106,7 +106,7 @@ "dummy" "mode-switcher" ]; - background-image = mkLiteral "url(\"${configPath}/assets/background.png\", width)"; + #background-image = mkLiteral "url(\"${configPath}/assets/background.png\", width)"; }; "entry" = { diff --git a/hosts/eva-03/configuration.nix b/hosts/eva-03/configuration.nix index 2b8421b..79de159 100644 --- a/hosts/eva-03/configuration.nix +++ b/hosts/eva-03/configuration.nix @@ -16,16 +16,17 @@ # Bootloader. boot.loader.efi.canTouchEfiVariables = true; - boot.loader.systemd-boot = { - enable = true; - windows = { - "11-Pro" = { - title = "Windows 11 Pro"; - efiDeviceHandle = "HD3c"; - sortKey = "z_windows"; - }; - }; - }; + boot.loader.systemd-boot.enable = true; +#{ +# enable = true; +# windows = { +# "11-Pro" = { +# title = "Windows 11 Pro"; +# efiDeviceHandle = "HD3c"; +# sortKey = "z_windows"; +# }; +# }; +# }; nix.settings.experimental-features = ["nix-command" "flakes"]; @@ -128,7 +129,10 @@ services.xrdp.openFirewall = true; # Enable Tailscale - services.tailscale.enable = true; + services.tailscale = { + enable = true; + package = pkgs-unstable.tailscale; + }; #Enable Ollama daemon # services.ollama.enable = true; @@ -141,13 +145,9 @@ acceleration = "cuda"; package = pkgs-unstable.ollama; loadModels = [ - "codegemma:7b" "deepcoder:14b" "gemma3:12b-it-qat" "gemma3:27b-it-qat" - "qwq:32b" - "deepseek-r1:32b" - "HammerAI/mythomax-l2:latest" ]; }; @@ -166,12 +166,12 @@ services.printing.enable = false; # Enable sound with pipewire. - hardware.pulseaudio.enable = false; + services.pulseaudio.enable = false; #hardware.pulseaudio = { # enable = true; # package = pkgs.pulseaudioFull; #}; - hardware.bluetooth.enable = false; + hardware.bluetooth.enable = true; security.rtkit.enable = true; services.pipewire = { enable = true; @@ -248,10 +248,9 @@ environment.systemPackages = with pkgs; [ #apps #cider-2 - amneziawg-go fprintd guacamole-client - sddm-astronaut + #sddm-astronaut polonium #cli tools @@ -277,7 +276,6 @@ openssl plocate ptunnel - tailscale tlp unzip vim @@ -285,13 +283,14 @@ wirelesstools #unstable - pkgs-unstable.vllm + #pkgs-unstable.tailscale pkgs-unstable.ollama + (pkgs-unstable.llama-cpp.override { cudaSupport = true; }) - ]; + #fonts + nerd-fonts.hack + nerd-fonts.fira-code - fonts.packages = with pkgs; [ - nerdfonts ]; home-manager = { @@ -302,15 +301,6 @@ backupFileExtension = "backup"; }; - #home-manager = { - # extraSpecialArgs = { inherit inputs; }; - # users = { - # "rogueking" = import ../home-manager/home.nix; - # }; - # backupFileExtension = "backup"; - #}; - - # Some programs need SUID wrappers, can be configured further or are # started in user sessions. # programs.mtr.enable = true; diff --git a/hosts/eva-03/hardware-configuration.nix b/hosts/eva-03/hardware-configuration.nix index b1454e3..f2151bc 100644 --- a/hosts/eva-03/hardware-configuration.nix +++ b/hosts/eva-03/hardware-configuration.nix @@ -8,24 +8,24 @@ [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "uas" "sd_mod" ]; + boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "sd_mod" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/b325c30d-e1e9-4845-898a-f2d85a35e494"; + { device = "/dev/disk/by-uuid/c8250302-044c-4be5-89b8-a07706a8dedf"; fsType = "ext4"; }; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/31E1-03D2"; + { device = "/dev/disk/by-uuid/E81D-0813"; fsType = "vfat"; options = [ "fmask=0077" "dmask=0077" ]; }; swapDevices = - [ { device = "/dev/disk/by-uuid/432a1564-851c-4246-ba69-4f11fd0e1765"; } + [ { device = "/dev/disk/by-uuid/d8666f92-b7cf-40fb-b305-d16a84d79fa0"; } ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking