From 377d70cfa65154811a549311ca8541cdb79e3863 Mon Sep 17 00:00:00 2001 From: steven carpenter Date: Tue, 15 Jul 2025 02:25:51 -0400 Subject: [PATCH] cleaned up host config for katana --- hosts/katana.nix | 73 ++++++++++++++++++----------------- modules/home-manager/home.nix | 2 +- users/speccon18/default.nix | 2 +- 3 files changed, 40 insertions(+), 37 deletions(-) diff --git a/hosts/katana.nix b/hosts/katana.nix index b2cfa5a..86a620c 100644 --- a/hosts/katana.nix +++ b/hosts/katana.nix @@ -5,7 +5,7 @@ # Hardware hardware = { enableRedistributableFirmware = lib.mkDefault true; - cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; + cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; bluetooth = { enable = true; # enables support for Bluetooth powerOnBoot = true; # powers up the default Bluetooth controller on boot @@ -15,7 +15,7 @@ }; }; }; - }; + }; # Boot boot = { @@ -33,16 +33,16 @@ readOnlyNixStore = true; }; - fileSystems."/" = { - device = "/dev/disk/by-uuid/7a97edd8-c5a9-4354-a461-24c0f311e61b"; - fsType = "ext4"; + fileSystems = { + "/" = { + device = "/dev/disk/by-uuid/7a97edd8-c5a9-4354-a461-24c0f311e61b"; + fsType = "ext4"; + }; + "/boot" = { + device = "/dev/disk/by-uuid/F0BD-FE72"; + fsType = "vfat"; + }; }; - - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/F0BD-FE72"; - fsType = "vfat"; - }; - swapDevices = [ { device = "/dev/disk/by-uuid/e107d78d-d934-4939-889d-1860410321d5"; @@ -78,7 +78,9 @@ }; }; - # Services. + programs.steam.enable = true; + + # Services services = { pcscd.enable = true; blueman.enable = true; @@ -114,35 +116,36 @@ }; environment.systemPackages = with pkgs; [ - gparted - bluez - blueman - home-manager - pkg-config - ripgrep - openssl - tree - eza - zsh + gparted # Drive Partition Manger + bluez # Bluetooth Stack + blueman # Bluetooth Management + home-manager # Dotfiles Management + pkg-config # Determine lib locations for linking during compliation + ripgrep # regex parser written in rust + openssl # SSL TLS Protocol + tree # Filetree to stdout + eza # LS rewritten in rust + zsh # Prefered Shell dig #dns lookup rage #file encryption age-plugin-yubikey #plugin for rage to manage yubi-2fa sops #file based secrets operations direnv #used for development environments - gcc - bottom - felix-fm - discord - neovim - brave - libation - libreoffice-qt6 - spotify - p7zip - yubioath-flutter - steam + gcc # Gnu C Compiler + bottom # Top rewritten in rust + felix-fm # File browser tui written in rust + discord # Discord for comms with friends + neovim # Modal Text Editor + brave # Web Browser + libation # Backup audible libraries + libreoffice-qt6 # Microsoft office but OSS + spotify # Spotify offical client + p7zip # posix complient 7zip + yubioath-flutter # Yubico Authenticator Client + lazygit # Git tui written in rust + glow # Markdown renderer for terminal ]; - + # Fonts fonts.packages = [ pkgs.nerd-fonts.droid-sans-mono diff --git a/modules/home-manager/home.nix b/modules/home-manager/home.nix index e6e3abc..77cd8d5 100644 --- a/modules/home-manager/home.nix +++ b/modules/home-manager/home.nix @@ -20,7 +20,7 @@ speccon18.hm.starship.enable = true; speccon18.hm.syncthing.enable = false; speccon18.hm.waybar.enable = false; - speccon18.hm.zellij.enable = false; + speccon18.hm.zellij.enable = true; speccon18.hm.zoxide.enable = false; speccon18.hm.zsh.enable = true; speccon18.hm.rio.enable = false; diff --git a/users/speccon18/default.nix b/users/speccon18/default.nix index e16cc98..30df695 100644 --- a/users/speccon18/default.nix +++ b/users/speccon18/default.nix @@ -6,7 +6,7 @@ isNormalUser = true; initialHashedPassword = "$y$j9T$RdLBHOvUpb17egl0d16LT/$3Y2RD/tT1IZ0nkfAR13pp3IzBjvKLRgGpDPLobUeO23"; openssh.authorizedKeys.keys = []; - description = "steven Carpenter"; + description = "Steven Carpenter"; extraGroups = [ "wheel" ];