TODO

@@ -1,9 +0,0 @@
-Create a command palette accessible with MOD+P (MOD => Windows Key)
-	(ie make fullscreen, send to monitor, etc)
-
-Make each monitor's window styling slightly different (just for fun)
-
-Bind 5 workspaces per connected monitor.
-	Then use the command palette (discussed prior) to send to
-	a different workspace (ie because I currently use MOD+SHIFT+n
-	but if n>=10 then it doesnt work! hence we need a command palette!)

homes/me/default.nix

@@ -15,11 +15,9 @@
     ../modules/bat.nix
     ../modules/fish.nix
     ../modules/editor/helix.nix
-    ../modules/editor/vscodium.nix
 
     ../modules/btop.nix
-    ../modules/term/ghostty.nix
+    ../modules/rio.nix
-    ../modules/term/rio.nix
     ../modules/firefox.nix
     ../modules/nixcord.nix
 

homes/modules/editor/vscodium.nix

@@ -1,9 +0,0 @@
-{pkgs, ...}: {
-  programs.vscode = {
-    enable = true;
-    package = pkgs.vscodium;
-
-    extensions = with pkgs.vscode-extensions; [
-    ];
-  };
-}

homes/modules/fish.nix

@@ -1,23 +1,13 @@
 {
   config,
-  lib,
   pkgs,
   ...
 }: {
-  options = {
-    morphBashToFish = lib.mkEnableOption "morphBashToFish";
-  };
-
-  config = {
   programs.fish = {
     enable = true;
     interactiveShellInit = ''
-        # add dotnet completions if it exists (ie we're in a virtual environment)
+      #set -g fish_greeting "Welcome weary traveler to my shop"
-        if type -q dotnet
+      cat ~/banner
-          complete -f -c dotnet -a "(dotnet complete (commandline -cp))"
-        end
-
-        set -g fish_greeting "Welcome weary traveller to my shop"
     '';
     plugins = [
       {
@@ -26,5 +16,4 @@
       }
     ];
   };
-  };
 }

homes/modules/rio.nix

@@ -3,16 +3,8 @@
   pkgs,
   ...
 }: {
-  home = {
-    packages = [
-      pkgs.rio
-    ];
-
-    # currently set to ghostty (on lolcathost)
-    #sessionVariables.TERMINAL = "rio";
-  };
-
   # The terminal I use
+  # TODO: this is dependent on nvim being installed
   # TODO: make this into a module with a configurable editor option
   programs.rio = {
     enable = true;

homes/modules/term/default.nix

@@ -1,9 +0,0 @@
-{
-  lib,
-  ...
-}:
-{
-  options = {
-    
-  }
-}

homes/modules/term/ghostty.nix

@@ -1,43 +0,0 @@
-{pkgs, ...}: {
-  home = {
-    packages = [
-      pkgs.ghostty
-      #(pkgs.writeShellScriptBin "xterm" ''${pkgs.ghostty}/bin/ghostty "$@"'')
-    ];
-
-    sessionVariables.TERMINAL = "ghostty";
-  };
-
-  programs.ghostty = {
-    enable = true;
-
-    settings = {
-      theme = "Dracula";
-      font-family = "Geist Nerd Font";
-      font-feature = ["liga" "calt"];
-
-      window-padding-x = 12;
-      window-padding-y = 6;
-      window-theme = "system";
-
-      window-height = 26;
-      window-width = 90;
-      copy-on-select = true;
-      gtk-single-instance = false;
-      adw-toolbar-style = "flat";
-
-      keybind = [
-        "ctrl+shift+plus=increase_font_size:1"
-        "ctrl+shift+minus=decrease_font_size:1"
-
-        "ctrl+h=goto_split:left"
-        "ctrl+l=goto_split:right"
-      ];
-    };
-
-    #themes = {
-    #aylur-dark = colors (import ./colors.nix {scheme = "dark";});
-    #aylur-light = colors (import ./colors.nix {scheme = "light";});
-    #};
-  };
-}

hosts/lolcathost/default.nix

@@ -6,16 +6,14 @@
 }: let
   home-manager = builtins.fetchTarball {
     url = "https://github.com/nix-community/home-manager/archive/release-24.11.tar.gz";
-    sha256 = "1qsvg11b5d05z2gvxq2pp6xfg3gpcd363id0h52sicikx3vai93s";
+    sha256 = "0c07xj74vsj37d3a8f98i9rhhhr99ckwlp45n40f0qkmigm3pk8s";
+    #sha256 = "15k41il0mvmwyv6jns4z8k6khhmb22jk5gpcqs1paym3l01g6abn";
   };
 in {
   imports = [
     ./hardware-configuration.nix
     (import "${home-manager}/nixos")
     inputs.spicetify-nix.nixosModules.default
-
-    ../modules/steam.nix
-    ../modules/obsidian.nix
   ];
 
   programs.spicetify = let
@@ -72,7 +70,7 @@ in {
   # networking.firewall.allowedTCPPorts = [ ... ];
   # networking.firewall.allowedUDPPorts = [ ... ];
   # Or disable the firewall altogether.
-  networking.firewall.enable = false;
+  networking.firewall.enable = true;
 
   # ----- SERVICES -----
   services = {
@@ -119,7 +117,7 @@ in {
       # literally me fr (personal account)
       me = {
         isNormalUser = true;
-        extraGroups = ["wheel" "netdev" "docker"];
+        extraGroups = ["wheel" "docker"];
         shell = pkgs.bash; #pkgs.fish
         packages = let
           # TODO: can I just do this: https://nix.dev/manual/nix/2.18/command-ref/new-cli/nix3-flake#url-like-syntax
@@ -189,15 +187,6 @@ in {
     ];
   };
 
-  # set environment variables
-  environment.sessionVariables = {
-    # folder names with capitalisation look awful!
-    XDG_DOWNLOAD_DIR = "$HOME/downloads";
-
-    # Hint Electrons apps to use Wayland
-    NIXOS_OZONE_WL = "1";
-  };
-
   # ---- SYSTEM PACKAGES -----
   environment.systemPackages = with pkgs; [
     # User Environment
@@ -218,9 +207,6 @@ in {
     # DEBUG: using neofetch temporarily to see if my system upgrades properly
     neofetch
 
-    openvpn
-    inetutils
-
     # fish plugins
     grc # colorise command outputs
 
@@ -264,8 +250,6 @@ in {
     zsh.enable = true;
     fish.enable = true;
 
-    nix-ld.enable = true;
-
     # I want to use fish as my login shell but it always goes terrible
     # cause it isn't POSIX compliant, so instead Bash is my login and
     # will just exec fish (^-^)
@@ -311,8 +295,8 @@ in {
     # TODO: change my default fonts
     fontconfig = {
       defaultFonts = {
-        serif = ["Geist"]; # TODO: package Iosevka Etoile since Iosevka isn't a serif font
+        serif = ["Iosevka"]; # TODO: package Iosevka Etoile since Iosevka isn't a serif font
-        sansSerif = ["Geist"];
+        sansSerif = ["Iosevka "];
         monospace = ["Cousine"];
         emoji = ["Noto Emoji"];
       };
@@ -341,12 +325,6 @@ in {
   # Enable OpenGL
   hardware = {
     graphics.enable = true;
-
-    # opengl = {
-    #   enable = true;
-    #   driSupport = true;
-    #   driSupport32Bit = true;
-    # }
   };
 
   # DO NOT MODIFY

hosts/modules/obsidian.nix

@@ -1,5 +0,0 @@
-{pkgs, ...}: {
-  environment.systemPackages = with pkgs; [
-    obsidian
-  ];
-}

hosts/modules/steam.nix

@@ -1,36 +0,0 @@
-{
-  pkgs,
-  lib,
-  ...
-}: {
-  nixpkgs.config.allowUnfreePredicate = pkg:
-    builtins.elem (lib.getName pkg) [
-      "steam"
-      "steam-original"
-      "steam-unwrapped"
-      "steam-run"
-    ];
-
-  programs = {
-    steam = {
-      enable = true;
-      gamescopeSession.enable = true;
-
-      remotePlay.openFirewall = true;
-      dedicatedServer.openFirewall = true;
-      localNetworkGameTransfers.openFirewall = true;
-    };
-
-    gamemode.enable = true;
-  };
-
-  environment.systemPackages = with pkgs; [
-    steamcmd
-
-    mangohud
-    protonup-qt
-    lutris
-    bottles
-    heroic
-  ];
-}