diff --git a/TODO b/TODO deleted file mode 100644 index 21efb53..0000000 --- a/TODO +++ /dev/null @@ -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!) diff --git a/homes/me/default.nix b/homes/me/default.nix index 14e6d99..f35678d 100755 --- a/homes/me/default.nix +++ b/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/term/rio.nix + ../modules/rio.nix ../modules/firefox.nix ../modules/nixcord.nix diff --git a/homes/modules/editor/vscodium.nix b/homes/modules/editor/vscodium.nix deleted file mode 100644 index c5daf64..0000000 --- a/homes/modules/editor/vscodium.nix +++ /dev/null @@ -1,9 +0,0 @@ -{pkgs, ...}: { - programs.vscode = { - enable = true; - package = pkgs.vscodium; - - extensions = with pkgs.vscode-extensions; [ - ]; - }; -} diff --git a/homes/modules/fish.nix b/homes/modules/fish.nix index bcc7d77..e46175d 100755 --- a/homes/modules/fish.nix +++ b/homes/modules/fish.nix @@ -1,30 +1,19 @@ { 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) - if type -q dotnet - complete -f -c dotnet -a "(dotnet complete (commandline -cp))" - end - - set -g fish_greeting "Welcome weary traveller to my shop" - ''; - plugins = [ - { - name = "grc"; - src = pkgs.fishPlugins.grc.src; - } - ]; - }; + programs.fish = { + enable = true; + interactiveShellInit = '' + #set -g fish_greeting "Welcome weary traveler to my shop" + cat ~/banner + ''; + plugins = [ + { + name = "grc"; + src = pkgs.fishPlugins.grc.src; + } + ]; }; } diff --git a/homes/modules/term/rio.nix b/homes/modules/rio.nix similarity index 90% rename from homes/modules/term/rio.nix rename to homes/modules/rio.nix index 88ef968..84ea3a2 100755 --- a/homes/modules/term/rio.nix +++ b/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; diff --git a/homes/modules/term/default.nix b/homes/modules/term/default.nix deleted file mode 100644 index d446b15..0000000 --- a/homes/modules/term/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ - lib, - ... -}: -{ - options = { - - } -} diff --git a/homes/modules/term/ghostty.nix b/homes/modules/term/ghostty.nix deleted file mode 100644 index 5eb2591..0000000 --- a/homes/modules/term/ghostty.nix +++ /dev/null @@ -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";}); - #}; - }; -} diff --git a/hosts/lolcathost/default.nix b/hosts/lolcathost/default.nix index d60e71f..2dcf179 100755 --- a/hosts/lolcathost/default.nix +++ b/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 @@ -69,10 +67,10 @@ in { networking.networkmanager.enable = true; # Open ports in the firewall. - #networking.firewall.allowedTCPPorts = [ ... ]; + # 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 - sansSerif = ["Geist"]; + serif = ["Iosevka"]; # TODO: package Iosevka Etoile since Iosevka isn't a serif font + 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 diff --git a/hosts/modules/obsidian.nix b/hosts/modules/obsidian.nix deleted file mode 100644 index ed800c3..0000000 --- a/hosts/modules/obsidian.nix +++ /dev/null @@ -1,5 +0,0 @@ -{pkgs, ...}: { - environment.systemPackages = with pkgs; [ - obsidian - ]; -} diff --git a/hosts/modules/steam.nix b/hosts/modules/steam.nix deleted file mode 100644 index 07f3ae1..0000000 --- a/hosts/modules/steam.nix +++ /dev/null @@ -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 - ]; -}