From efafee2ffe503c49d699fbf0dfecc26b6f9766a9 Mon Sep 17 00:00:00 2001 From: installer Date: Thu, 13 Feb 2025 17:27:51 -0600 Subject: [PATCH] Make current setup the default --- flake.nix | 2 +- hosts/default/config.nix | 194 ++----------- hosts/default/hardware.nix | 14 +- hosts/default/packages.nix | 171 ++++++++++++ hosts/nixstation/config.nix | 480 --------------------------------- hosts/nixstation/hardware.nix | 46 ---- hosts/nixstation/home.nix | 224 --------------- hosts/nixstation/users.nix | 39 --- hosts/nixstation/variables.nix | 17 -- 9 files changed, 200 insertions(+), 987 deletions(-) create mode 100644 hosts/default/packages.nix delete mode 100644 hosts/nixstation/config.nix delete mode 100644 hosts/nixstation/hardware.nix delete mode 100644 hosts/nixstation/home.nix delete mode 100644 hosts/nixstation/users.nix delete mode 100644 hosts/nixstation/variables.nix diff --git a/flake.nix b/flake.nix index 7d7666f..a8cdc1c 100644 --- a/flake.nix +++ b/flake.nix @@ -16,7 +16,7 @@ { nixpkgs, home-manager, ... }@inputs: let system = "x86_64-linux"; - host = "nixstation"; + host = "default"; username = "zaney"; in { diff --git a/hosts/default/config.nix b/hosts/default/config.nix index 4e4bf75..f6aa29f 100644 --- a/hosts/default/config.nix +++ b/hosts/default/config.nix @@ -13,6 +13,7 @@ in imports = [ ./hardware.nix ./users.nix + ./packages.nix ../../modules/amd-drivers.nix ../../modules/nvidia-drivers.nix ../../modules/nvidia-prime-drivers.nix @@ -55,24 +56,24 @@ in stylix = { enable = true; image = ../../config/wallpapers/beautifulmountainscape.jpg; - # base16Scheme = { - # base00 = "232136"; - # base01 = "2a273f"; - # base02 = "393552"; - # base03 = "6e6a86"; - # base04 = "908caa"; - # base05 = "e0def4"; - # base06 = "e0def4"; - # base07 = "56526e"; - # base08 = "eb6f92"; - # base09 = "f6c177"; - # base0A = "ea9a97"; - # base0B = "3e8fb0"; - # base0C = "9ccfd8"; - # base0D = "c4a7e7"; - # base0E = "f6c177"; - # base0F = "56526e"; - # }; + base16Scheme = { + base00 = "282936"; + base01 = "3a3c4e"; + base02 = "4d4f68"; + base03 = "626483"; + base04 = "62d6e8"; + base05 = "e9e9f4"; + base06 = "f1f2f8"; + base07 = "f7f7fb"; + base08 = "ea51b2"; + base09 = "b45bcf"; + base0A = "00f769"; + base0B = "ebff87"; + base0C = "a1efe4"; + base0D = "62d6e8"; + base0E = "b45bcf"; + base0F = "00f769"; + }; polarity = "dark"; opacity.terminal = 0.8; cursor.package = pkgs.bibata-cursors; @@ -135,167 +136,10 @@ in LC_TIME = "en_US.UTF-8"; }; - programs = { - firefox.enable = false; - starship = { - enable = true; - settings = { - add_newline = false; - buf = { - symbol = " "; - }; - c = { - symbol = " "; - }; - directory = { - read_only = " 󰌾"; - }; - docker_context = { - symbol = " "; - }; - fossil_branch = { - symbol = " "; - }; - git_branch = { - symbol = " "; - }; - golang = { - symbol = " "; - }; - hg_branch = { - symbol = " "; - }; - hostname = { - ssh_symbol = " "; - }; - lua = { - symbol = " "; - }; - memory_usage = { - symbol = "󰍛 "; - }; - meson = { - symbol = "󰔷 "; - }; - nim = { - symbol = "󰆥 "; - }; - nix_shell = { - symbol = " "; - }; - nodejs = { - symbol = " "; - }; - ocaml = { - symbol = " "; - }; - package = { - symbol = "󰏗 "; - }; - python = { - symbol = " "; - }; - rust = { - symbol = " "; - }; - swift = { - symbol = " "; - }; - zig = { - symbol = " "; - }; - }; - }; - dconf.enable = true; - seahorse.enable = true; - fuse.userAllowOther = true; - mtr.enable = true; - gnupg.agent = { - enable = true; - enableSSHSupport = true; - }; - virt-manager.enable = true; - steam = { - enable = true; - gamescopeSession.enable = true; - remotePlay.openFirewall = true; - dedicatedServer.openFirewall = true; - }; - thunar = { - enable = true; - plugins = with pkgs.xfce; [ - thunar-archive-plugin - thunar-volman - ]; - }; - }; - - nixpkgs.config.allowUnfree = true; - users = { mutableUsers = true; }; - environment.systemPackages = with pkgs; [ - vim - wget - killall - docker-compose - eza - git - cmatrix - lolcat - htop - brave - libvirt - lxqt.lxqt-policykit - lm_sensors - unzip - unrar - libnotify - v4l-utils - ydotool - duf - ncdu - wl-clipboard - pciutils - ffmpeg - socat - cowsay - ripgrep - lshw - bat - pkg-config - meson - hyprpicker - ninja - brightnessctl - virt-viewer - swappy - appimage-run - networkmanagerapplet - yad - inxi - playerctl - nh - nixfmt-rfc-style - discord - libvirt - swww - grim - slurp - file-roller - swaynotificationcenter - imv - mpv - gimp - pavucontrol - tree - spotify - neovide - greetd.tuigreet - ]; - fonts = { packages = with pkgs; [ noto-fonts-emoji diff --git a/hosts/default/hardware.nix b/hosts/default/hardware.nix index de1c72e..0aebd7b 100644 --- a/hosts/default/hardware.nix +++ b/hosts/default/hardware.nix @@ -8,20 +8,22 @@ [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "nvme" "usbhid" "sd_mod" ]; + boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/c537152e-ea4f-4bb7-b453-088612e0024a"; + { device = "/dev/disk/by-uuid/dd005850-6230-40c4-9d70-8c8cf443658d"; fsType = "ext4"; }; + boot.initrd.luks.devices."luks-b7565781-148e-4c94-9c76-36c84dd93dc8".device = "/dev/disk/by-uuid/b7565781-148e-4c94-9c76-36c84dd93dc8"; + fileSystems."/boot" = - { device = "/dev/disk/by-uuid/DA7B-269C"; + { device = "/dev/disk/by-uuid/C2A6-DF56"; fsType = "vfat"; - options = [ "fmask=0022" "dmask=0022" ]; + options = [ "fmask=0077" "dmask=0077" ]; }; swapDevices = [ ]; @@ -31,7 +33,9 @@ # 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.enp7s0.useDHCP = lib.mkDefault true; + # networking.interfaces.docker0.useDHCP = lib.mkDefault true; + # networking.interfaces.eno2.useDHCP = lib.mkDefault true; + # networking.interfaces.wlo1.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; diff --git a/hosts/default/packages.nix b/hosts/default/packages.nix new file mode 100644 index 0000000..a055d37 --- /dev/null +++ b/hosts/default/packages.nix @@ -0,0 +1,171 @@ +{ + config, + pkgs, + ... +}: + +{ + programs = { + + firefox.enable = false; + dconf.enable = true; + seahorse.enable = true; + fuse.userAllowOther = true; + virt-manager.enable = true; + mtr.enable = true; + + starship = { + enable = true; + settings = { + add_newline = false; + buf = { + symbol = " "; + }; + c = { + symbol = " "; + }; + directory = { + read_only = " 󰌾"; + }; + docker_context = { + symbol = " "; + }; + fossil_branch = { + symbol = " "; + }; + git_branch = { + symbol = " "; + }; + golang = { + symbol = " "; + }; + hg_branch = { + symbol = " "; + }; + hostname = { + ssh_symbol = " "; + }; + lua = { + symbol = " "; + }; + memory_usage = { + symbol = "󰍛 "; + }; + meson = { + symbol = "󰔷 "; + }; + nim = { + symbol = "󰆥 "; + }; + nix_shell = { + symbol = " "; + }; + nodejs = { + symbol = " "; + }; + ocaml = { + symbol = " "; + }; + package = { + symbol = "󰏗 "; + }; + python = { + symbol = " "; + }; + rust = { + symbol = " "; + }; + swift = { + symbol = " "; + }; + zig = { + symbol = " "; + }; + }; + }; + + gnupg.agent = { + enable = true; + enableSSHSupport = true; + }; + + steam = { + enable = true; + gamescopeSession.enable = true; + remotePlay.openFirewall = true; + dedicatedServer.openFirewall = true; + }; + + thunar = { + enable = true; + plugins = with pkgs.xfce; [ + thunar-archive-plugin + thunar-volman + ]; + }; + }; + + nixpkgs.config.allowUnfree = true; + + environment.systemPackages = with pkgs; [ + appimage-run + bat + brave + brightnessctl + cmatrix + cowsay + discord + docker-compose + duf + eza + ffmpeg + file-roller + gimp + git + greetd.tuigreet + grim + htop + hyprpicker + imv + inxi + killall + libnotify + libvirt + libvirt + lm_sensors + lolcat + lshw + lxqt.lxqt-policykit + meson + mpv + ncdu + neovide + networkmanagerapplet + nh + ninja + nixfmt-rfc-style + pavucontrol + pciutils + pkg-config + playerctl + ripgrep + slurp + socat + spotify + swappy + swaynotificationcenter + swww + tree + unrar + unzip + usbutils + v4l-utils + vim + virt-viewer + wget + wl-clipboard + yad + ydotool + ]; + +} diff --git a/hosts/nixstation/config.nix b/hosts/nixstation/config.nix deleted file mode 100644 index 3408ef8..0000000 --- a/hosts/nixstation/config.nix +++ /dev/null @@ -1,480 +0,0 @@ -{ - config, - pkgs, - host, - username, - options, - ... -}: -let - inherit (import ./variables.nix) keyboardLayout consoleKeyMap; -in -{ - imports = [ - ./hardware.nix - ./users.nix - ../../modules/amd-drivers.nix - ../../modules/nvidia-drivers.nix - ../../modules/nvidia-prime-drivers.nix - ../../modules/intel-drivers.nix - ../../modules/vm-guest-services.nix - ../../modules/local-hardware-clock.nix - ]; - - boot = { - # Kernel - kernelPackages = pkgs.linuxPackages_zen; - # This is for OBS Virtual Cam Support - kernelModules = [ "v4l2loopback" ]; - extraModulePackages = [ config.boot.kernelPackages.v4l2loopback ]; - # Needed For Some Steam Games - kernel.sysctl = { - "vm.max_map_count" = 2147483642; - }; - # Bootloader. - loader.systemd-boot.enable = true; - loader.efi.canTouchEfiVariables = true; - # Make /tmp a tmpfs - tmp = { - useTmpfs = false; - tmpfsSize = "30%"; - }; - # Appimage Support - binfmt.registrations.appimage = { - wrapInterpreterInShell = false; - interpreter = "${pkgs.appimage-run}/bin/appimage-run"; - recognitionType = "magic"; - offset = 0; - mask = ''\xff\xff\xff\xff\x00\x00\x00\x00\xff\xff\xff''; - magicOrExtension = ''\x7fELF....AI\x02''; - }; - plymouth.enable = true; - }; - - # Styling Options - stylix = { - enable = true; - image = ../../config/wallpapers/beautifulmountainscape.jpg; - # base16Scheme = { - # base00 = "232136"; - # base01 = "2a273f"; - # base02 = "393552"; - # base03 = "6e6a86"; - # base04 = "908caa"; - # base05 = "e0def4"; - # base06 = "e0def4"; - # base07 = "56526e"; - # base08 = "eb6f92"; - # base09 = "f6c177"; - # base0A = "ea9a97"; - # base0B = "3e8fb0"; - # base0C = "9ccfd8"; - # base0D = "c4a7e7"; - # base0E = "f6c177"; - # base0F = "56526e"; - # }; - polarity = "dark"; - opacity.terminal = 0.8; - cursor.package = pkgs.bibata-cursors; - cursor.name = "Bibata-Modern-Ice"; - cursor.size = 24; - fonts = { - monospace = { - package = pkgs.nerd-fonts.jetbrains-mono; - name = "JetBrainsMono Nerd Font Mono"; - }; - sansSerif = { - package = pkgs.montserrat; - name = "Montserrat"; - }; - serif = { - package = pkgs.montserrat; - name = "Montserrat"; - }; - sizes = { - applications = 12; - terminal = 15; - desktop = 11; - popups = 12; - }; - }; - }; - - # Extra Module Options - drivers.amdgpu.enable = false; - drivers.nvidia.enable = false; - drivers.nvidia-prime = { - enable = false; - intelBusID = ""; - nvidiaBusID = ""; - }; - drivers.intel.enable = false; - vm.guest-services.enable = false; - local.hardware-clock.enable = false; - - # Enable networking - networking.networkmanager.enable = true; - networking.hostName = host; - networking.timeServers = options.networking.timeServers.default ++ [ "pool.ntp.org" ]; - - # Set your time zone. - time.timeZone = "America/Chicago"; - - # Select internationalisation properties. - i18n.defaultLocale = "en_US.UTF-8"; - - i18n.extraLocaleSettings = { - LC_ADDRESS = "en_US.UTF-8"; - LC_IDENTIFICATION = "en_US.UTF-8"; - LC_MEASUREMENT = "en_US.UTF-8"; - LC_MONETARY = "en_US.UTF-8"; - LC_NAME = "en_US.UTF-8"; - LC_NUMERIC = "en_US.UTF-8"; - LC_PAPER = "en_US.UTF-8"; - LC_TELEPHONE = "en_US.UTF-8"; - LC_TIME = "en_US.UTF-8"; - }; - - programs = { - firefox.enable = false; - starship = { - enable = true; - settings = { - add_newline = false; - buf = { - symbol = " "; - }; - c = { - symbol = " "; - }; - directory = { - read_only = " 󰌾"; - }; - docker_context = { - symbol = " "; - }; - fossil_branch = { - symbol = " "; - }; - git_branch = { - symbol = " "; - }; - golang = { - symbol = " "; - }; - hg_branch = { - symbol = " "; - }; - hostname = { - ssh_symbol = " "; - }; - lua = { - symbol = " "; - }; - memory_usage = { - symbol = "󰍛 "; - }; - meson = { - symbol = "󰔷 "; - }; - nim = { - symbol = "󰆥 "; - }; - nix_shell = { - symbol = " "; - }; - nodejs = { - symbol = " "; - }; - ocaml = { - symbol = " "; - }; - package = { - symbol = "󰏗 "; - }; - python = { - symbol = " "; - }; - rust = { - symbol = " "; - }; - swift = { - symbol = " "; - }; - zig = { - symbol = " "; - }; - }; - }; - dconf.enable = true; - seahorse.enable = true; - fuse.userAllowOther = true; - mtr.enable = true; - gnupg.agent = { - enable = true; - enableSSHSupport = true; - }; - virt-manager.enable = true; - steam = { - enable = true; - gamescopeSession.enable = true; - remotePlay.openFirewall = true; - dedicatedServer.openFirewall = true; - }; - thunar = { - enable = true; - plugins = with pkgs.xfce; [ - thunar-archive-plugin - thunar-volman - ]; - }; - }; - - nixpkgs.config.allowUnfree = true; - - users = { - mutableUsers = true; - }; - - environment.systemPackages = with pkgs; [ - vim - wget - killall - docker-compose - eza - git - cmatrix - lolcat - htop - brave - libvirt - lxqt.lxqt-policykit - lm_sensors - unzip - unrar - libnotify - v4l-utils - ydotool - duf - ncdu - wl-clipboard - pciutils - ffmpeg - socat - cowsay - ripgrep - lshw - bat - pkg-config - meson - hyprpicker - ninja - brightnessctl - virt-viewer - swappy - appimage-run - networkmanagerapplet - yad - inxi - playerctl - nh - nixfmt-rfc-style - discord - libvirt - swww - grim - slurp - file-roller - swaynotificationcenter - imv - mpv - gimp - pavucontrol - tree - spotify - neovide - greetd.tuigreet - ]; - - fonts = { - packages = with pkgs; [ - noto-fonts-emoji - noto-fonts-cjk-sans - font-awesome - symbola - material-icons - ]; - }; - - environment.variables = { - ZANEYOS_VERSION = "2.3"; - ZANEYOS = "true"; - }; - - # Extra Portal Configuration - xdg.portal = { - enable = true; - wlr.enable = true; - extraPortals = [ - pkgs.xdg-desktop-portal-gtk - pkgs.xdg-desktop-portal - ]; - configPackages = [ - pkgs.xdg-desktop-portal-gtk - pkgs.xdg-desktop-portal-hyprland - pkgs.xdg-desktop-portal - ]; - }; - - # Services to start - services = { - xserver = { - enable = false; - xkb = { - layout = "${keyboardLayout}"; - variant = ""; - }; - }; - greetd = { - enable = true; - vt = 3; - settings = { - default_session = { - # Wayland Desktop Manager is installed only for user ryan via home-manager! - user = username; - # .wayland-session is a script generated by home-manager, which links to the current wayland compositor(sway/hyprland or others). - # with such a vendor-no-locking script, we can switch to another wayland compositor without modifying greetd's config here. - # command = "$HOME/.wayland-session"; # start a wayland session directly without a login manager - command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd Hyprland"; # start Hyprland with a TUI login manager - }; - }; - }; - smartd = { - enable = false; - autodetect = true; - }; - libinput.enable = true; - fstrim.enable = true; - gvfs.enable = true; - openssh.enable = true; - flatpak.enable = false; - printing = { - enable = true; - drivers = [ - # pkgs.hplipWithPlugin - ]; - }; - gnome.gnome-keyring.enable = true; - avahi = { - enable = true; - nssmdns4 = true; - openFirewall = true; - }; - ipp-usb.enable = true; - syncthing = { - enable = false; - user = "${username}"; - dataDir = "/home/${username}"; - configDir = "/home/${username}/.config/syncthing"; - }; - pipewire = { - enable = true; - alsa.enable = true; - alsa.support32Bit = true; - pulse.enable = true; - }; - rpcbind.enable = false; - nfs.server.enable = false; - }; - systemd.services.flatpak-repo = { - path = [ pkgs.flatpak ]; - script = '' - flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo - ''; - }; - hardware.sane = { - enable = true; - extraBackends = [ pkgs.sane-airscan ]; - disabledDefaultBackends = [ "escl" ]; - }; - - # Extra Logitech Support - hardware.logitech.wireless.enable = false; - hardware.logitech.wireless.enableGraphical = false; - - # Bluetooth Support - hardware.bluetooth.enable = true; - hardware.bluetooth.powerOnBoot = true; - services.blueman.enable = true; - - # Enable sound with pipewire. - services.pulseaudio.enable = false; - - # Security / Polkit - security.rtkit.enable = true; - security.polkit.enable = true; - security.polkit.extraConfig = '' - polkit.addRule(function(action, subject) { - if ( - subject.isInGroup("users") - && ( - action.id == "org.freedesktop.login1.reboot" || - action.id == "org.freedesktop.login1.reboot-multiple-sessions" || - action.id == "org.freedesktop.login1.power-off" || - action.id == "org.freedesktop.login1.power-off-multiple-sessions" - ) - ) - { - return polkit.Result.YES; - } - }) - ''; - security.pam.services.swaylock = { - text = '' - auth include login - ''; - }; - - # Optimization settings and garbage collection automation - nix = { - settings = { - auto-optimise-store = true; - experimental-features = [ - "nix-command" - "flakes" - ]; - substituters = [ "https://hyprland.cachix.org" ]; - trusted-public-keys = [ "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" ]; - }; - gc = { - automatic = true; - dates = "weekly"; - options = "--delete-older-than 7d"; - }; - }; - - # Virtualization / Containers - virtualisation.libvirtd.enable = true; - virtualisation.docker.enable = true; - - # OpenGL - hardware.graphics = { - enable = true; - }; - - console.keyMap = "${consoleKeyMap}"; - - # Open ports in the firewall. - # networking.firewall.allowedTCPPorts = [ ... ]; - # networking.firewall.allowedUDPPorts = [ ... ]; - # Or disable the firewall altogether. - # networking.firewall.enable = false; - - # 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 - # this value at the release version of the first install of this system. - # Before changing this value read the documentation for this option - # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). - system.stateVersion = "23.11"; # Did you read the comment? -} diff --git a/hosts/nixstation/hardware.nix b/hosts/nixstation/hardware.nix deleted file mode 100644 index 4ff6697..0000000 --- a/hosts/nixstation/hardware.nix +++ /dev/null @@ -1,46 +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 + "/installer/scan/not-detected.nix") - ]; - - boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = - { device = "/dev/disk/by-uuid/8bac633b-c4e6-44bc-83b3-97b5472594e8"; - fsType = "ext4"; - }; - - boot.initrd.luks.devices."luks-8941ac93-f043-46d1-b128-37d5e846303f".device = "/dev/disk/by-uuid/8941ac93-f043-46d1-b128-37d5e846303f"; - - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/BC0C-F843"; - fsType = "vfat"; - options = [ "fmask=0077" "dmask=0077" ]; - }; - - fileSystems."/home/zaney/BFD" = - { device = "/dev/disk/by-uuid/5A30E2CC30E2AE67"; - fsType = "ntfs"; - options = [ "defaults" "umask=000" "dmask=027" "fmask=137" "uid=1000" "gid=1000" "windows_names" ]; - }; - - swapDevices = [ ]; - - # 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.enp5s0.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -} diff --git a/hosts/nixstation/home.nix b/hosts/nixstation/home.nix deleted file mode 100644 index 88f4860..0000000 --- a/hosts/nixstation/home.nix +++ /dev/null @@ -1,224 +0,0 @@ -{ - pkgs, - username, - host, - ... -}: -let - inherit (import ./variables.nix) gitUsername gitEmail; -in -{ - # Home Manager Settings - home.username = "${username}"; - home.homeDirectory = "/home/${username}"; - home.stateVersion = "23.11"; - - # Import Program Configurations - imports = [ - ../../config/emoji.nix - ../../config/fastfetch - ../../config/hyprland.nix - ../../config/neovim.nix - ../../config/rofi/rofi.nix - ../../config/rofi/config-emoji.nix - ../../config/rofi/config-long.nix - ../../config/swaync.nix - ../../config/waybar.nix - ../../config/wlogout.nix - ../../config/fastfetch - ]; - - # Place Files Inside Home Directory - home.file."Pictures/Wallpapers" = { - source = ../../config/wallpapers; - recursive = true; - }; - home.file.".config/wlogout/icons" = { - source = ../../config/wlogout; - recursive = true; - }; - home.file.".face.icon".source = ../../config/face.jpg; - home.file.".config/face.jpg".source = ../../config/face.jpg; - home.file.".config/swappy/config".text = '' - [Default] - save_dir=/home/${username}/Pictures/Screenshots - save_filename_format=swappy-%Y%m%d-%H%M%S.png - show_panel=false - line_size=5 - text_size=20 - text_font=Ubuntu - paint_mode=brush - early_exit=true - fill_shape=false - ''; - - # Install & Configure Git - programs.git = { - enable = true; - userName = "${gitUsername}"; - userEmail = "${gitEmail}"; - }; - - # Create XDG Dirs - xdg = { - userDirs = { - enable = true; - createDirectories = true; - }; - }; - - dconf.settings = { - "org/virt-manager/virt-manager/connections" = { - autoconnect = [ "qemu:///system" ]; - uris = [ "qemu:///system" ]; - }; - }; - - # Styling Options - stylix.targets.waybar.enable = false; - stylix.targets.rofi.enable = false; - stylix.targets.hyprland.enable = false; - gtk = { - iconTheme = { - name = "Papirus-Dark"; - package = pkgs.papirus-icon-theme; - }; - gtk3.extraConfig = { - gtk-application-prefer-dark-theme = 1; - }; - gtk4.extraConfig = { - gtk-application-prefer-dark-theme = 1; - }; - }; - qt = { - enable = true; - style.name = "adwaita-dark"; - platformTheme.name = "gtk3"; - }; - - - # Scripts - home.packages = [ - (import ../../scripts/emopicker9000.nix { inherit pkgs; }) - (import ../../scripts/task-waybar.nix { inherit pkgs; }) - (import ../../scripts/squirtle.nix { inherit pkgs; }) - (import ../../scripts/nvidia-offload.nix { inherit pkgs; }) - (import ../../scripts/wallsetter.nix { - inherit pkgs; - inherit username; - }) - (import ../../scripts/web-search.nix { inherit pkgs; }) - (import ../../scripts/rofi-launcher.nix { inherit pkgs; }) - (import ../../scripts/screenshootin.nix { inherit pkgs; }) - (import ../../scripts/list-hypr-bindings.nix { - inherit pkgs; - inherit host; - }) - ]; - - services = { - hypridle = { - enable = true; - settings = { - general = { - after_sleep_cmd = "hyprctl dispatch dpms on"; - ignore_dbus_inhibit = false; - lock_cmd = "hyprlock"; - }; - listener = [ - { - timeout = 900; - on-timeout = "hyprlock"; - } - { - timeout = 1200; - on-timeout = "hyprctl dispatch dpms off"; - on-resume = "hyprctl dispatch dpms on"; - } - ]; - }; - }; - }; - - programs = { - gh.enable = true; - btop = { - enable = true; - settings = { - vim_keys = true; - }; - }; - kitty = { - enable = true; - package = pkgs.kitty; - settings = { - scrollback_lines = 2000; - wheel_scroll_min_lines = 1; - window_padding_width = 4; - confirm_os_window_close = 0; - }; - extraConfig = '' - tab_bar_style fade - tab_fade 1 - active_tab_font_style bold - inactive_tab_font_style bold - ''; - }; - starship = { - enable = true; - package = pkgs.starship; - }; - bash = { - enable = true; - enableCompletion = true; - profileExtra = '' - #if [ -z "$DISPLAY" ] && [ "$XDG_VTNR" = 1 ]; then - # exec Hyprland - #fi - ''; - initExtra = '' - fastfetch - if [ -f $HOME/.bashrc-personal ]; then - source $HOME/.bashrc-personal - fi - ''; - shellAliases = { - sv = "sudo nvim"; - fr = "nh os switch --hostname ${host} /home/${username}/zaneyos"; - fu = "nh os switch --hostname ${host} --update /home/${username}/zaneyos"; - zu = "sh <(curl -L https://gitlab.com/Zaney/zaneyos/-/raw/main/install-zaneyos.sh)"; - ncg = "nix-collect-garbage --delete-old && sudo nix-collect-garbage -d && sudo /run/current-system/bin/switch-to-configuration boot"; - v = "nvim"; - cat = "bat"; - ls = "eza --icons"; - ll = "eza -lh --icons --grid --group-directories-first"; - la = "eza -lah --icons --grid --group-directories-first"; - ".." = "cd .."; - }; - }; - home-manager.enable = true; - hyprlock = { - enable = true; - settings = { - general = { - disable_loading_bar = true; - grace = 10; - hide_cursor = true; - no_fade_in = false; - }; - image = [ - { - path = "/home/${username}/.config/face.jpg"; - size = 150; - border_size = 4; - border_color = "rgb(0C96F9)"; - rounding = -1; # Negative means circle - position = "0, 200"; - halign = "center"; - valign = "center"; - } - ]; - }; - }; - }; -} diff --git a/hosts/nixstation/users.nix b/hosts/nixstation/users.nix deleted file mode 100644 index 558ddc4..0000000 --- a/hosts/nixstation/users.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ - pkgs, - username, - ... -}: - -let - inherit (import ./variables.nix) gitUsername; -in -{ - users.users = { - "${username}" = { - homeMode = "755"; - isNormalUser = true; - description = "${gitUsername}"; - extraGroups = [ - "networkmanager" - "wheel" - "libvirtd" - "scanner" - "lp" - "docker" - ]; - shell = pkgs.bash; - ignoreShellProgramCheck = true; - packages = with pkgs; [ - ]; - }; - # "newuser" = { - # homeMode = "755"; - # isNormalUser = true; - # description = "New user account"; - # extraGroups = [ "networkmanager" "wheel" "libvirtd" ]; - # shell = pkgs.bash; - # ignoreShellProgramCheck = true; - # packages = with pkgs; []; - # }; - }; -} diff --git a/hosts/nixstation/variables.nix b/hosts/nixstation/variables.nix deleted file mode 100644 index d9891b3..0000000 --- a/hosts/nixstation/variables.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ - # Git Configuration ( For Pulling Software Repos ) - gitUsername = "Tyler Kelley"; - gitEmail = "tylerzanekelley@gmail.com"; - - # Hyprland Settings - extraMonitorSettings = ""; - - # Waybar Settings - clock24h = false; - - # Program Options - browser = "brave"; # Set Default Browser (google-chrome-stable for google-chrome) - terminal = "kitty"; # Set Default System Terminal - keyboardLayout = "us"; - consoleKeyMap = "us"; -}