diff --git a/configuration.nix b/configuration.nix index 2666c62..b620dca 100644 --- a/configuration.nix +++ b/configuration.nix @@ -14,8 +14,6 @@ ./modules/programs.nix ./modules/hardware.nix ./modules/services.nix - ./modules/aliases.nix - ./modules/assets.nix ./modules/home.nix ]; diff --git a/modules/aliases.nix b/modules/aliases.nix deleted file mode 100644 index a98e140..0000000 --- a/modules/aliases.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ config, pkgs, ... }: - -{ - environment.shellAliases = { - # Nix Commands - "nix:rebuild" = "sudo nixos-rebuild switch"; - "nix:update" = "sudo nixos-rebuild switch --upgrade"; - "nix:purge" = "sudo nix-collect-garbage -d && sudo /run/current-system/bin/switch-to-configuration boot"; - "nix:edit" = "$EDITOR /etc/nixos"; - "nix:push" = "cd /etc/nixos && git add -A && git commit -m \"$(date -u +%s)\" && git push"; - "nix:pull" = "cd /etc/nixos && git pull"; - "nix:hw" = "sudo nixos-generate-config --show-hardware-config > /etc/nixos/hardware-configuration.nix"; - - # Utilities - "fixaudio" = "systemctl --user restart pipewire pipewire-pulse wireplumber"; - "nf" = "neofetch"; - }; -} diff --git a/modules/assets.nix b/modules/assets.nix deleted file mode 100644 index c14acb7..0000000 --- a/modules/assets.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ config, pkgs, lib, ... }: - -let - settings = import ../settings.nix; - # The assets folder from the project root - assetsPath = ../assets; -in -{ - # Use tmpfiles.rules to create the symlink at boot/activation - # L+ forces the creation of the symlink, removing existing file/dir if necessary - systemd.tmpfiles.rules = [ - "L+ /home/${settings.username}/Assets - - - - ${assetsPath}" - ]; -} diff --git a/modules/home.nix b/modules/home.nix index 0dd59ff..4ef1731 100644 --- a/modules/home.nix +++ b/modules/home.nix @@ -3,9 +3,6 @@ let home-manager = builtins.fetchTarball "https://github.com/nix-community/home-manager/archive/release-25.11.tar.gz"; settings = import ../settings.nix; - nur = import (builtins.fetchTarball "https://github.com/nix-community/NUR/archive/master.tar.gz") { - inherit pkgs; - }; homeModules = [ ./home/session.nix ./home/packages.nix @@ -28,7 +25,7 @@ in home-manager.backupFileExtension = "backup"; home-manager.extraSpecialArgs = { - inherit settings nur; + inherit settings; }; home-manager.users.${settings.username} = { ... }: { diff --git a/modules/home/cli.nix b/modules/home/cli.nix index 8fa96ff..681e13d 100644 --- a/modules/home/cli.nix +++ b/modules/home/cli.nix @@ -1,6 +1,21 @@ { pkgs, ... }: { + home.shellAliases = { + # Nix Commands + "nix:rebuild" = "sudo nixos-rebuild switch"; + "nix:update" = "sudo nixos-rebuild switch --upgrade"; + "nix:purge" = "sudo nix-collect-garbage -d && sudo /run/current-system/bin/switch-to-configuration boot"; + "nix:edit" = "$EDITOR /etc/nixos"; + "nix:push" = "cd /etc/nixos && git add -A && git commit -m \"$(date -u +%s)\" && git push"; + "nix:pull" = "cd /etc/nixos && git pull"; + "nix:hw" = "sudo nixos-generate-config --show-hardware-config > /etc/nixos/hardware-configuration.nix"; + + # Utilities + "fixaudio" = "systemctl --user restart pipewire pipewire-pulse wireplumber"; + "nf" = "neofetch"; + }; + programs.starship = { enable = true; enableBashIntegration = true; diff --git a/modules/home/packages.nix b/modules/home/packages.nix index 9dec113..36f9aa5 100644 --- a/modules/home/packages.nix +++ b/modules/home/packages.nix @@ -10,11 +10,8 @@ gnumake openssh nodePackages."pnpm" - openssl - killall ffmpeg vscodium - usbutils qmk neofetch deepfilternet @@ -36,4 +33,6 @@ # GNOME Extensions gnomeExtensions.appindicator ]; + + programs.obs-studio.enable = true; } diff --git a/modules/home/session.nix b/modules/home/session.nix index 8339192..f8533d7 100644 --- a/modules/home/session.nix +++ b/modules/home/session.nix @@ -1,6 +1,8 @@ { config, ... }: { + home.file."Assets".source = ../../assets; + home.sessionVariables = { BROWSER = "librewolf"; SSH_AUTH_SOCK = "${config.home.homeDirectory}/.bitwarden-ssh-agent.sock"; diff --git a/modules/programs.nix b/modules/programs.nix index 93b210a..5665fce 100644 --- a/modules/programs.nix +++ b/modules/programs.nix @@ -7,8 +7,6 @@ environment.systemPackages = with pkgs; [ killall usbutils - pavucontrol - ffmpeg openssl qmk-udev-rules ]; @@ -23,6 +21,4 @@ }; programs.java.enable = true; - - programs.obs-studio.enable = true; }