diff --git a/extract.sh b/extract.sh new file mode 100644 index 0000000..0393cd4 --- /dev/null +++ b/extract.sh @@ -0,0 +1,36 @@ +#!/bin/bash + +function extract { +if [ -z "$1" ]; then + # display usage if no parameters given + echo "Usage: extract ." + echo " extract [path/file_name_2.ext] [path/file_name_3.ext]" +else + for n in "$@" + do + if [ -f "$n" ] ; then + case "${n%,}" in + *.tar.bz2|*.tar.gz|*.tar.xz|*.tbz2|*.tgz|*.txz|*.tar) + tar xvf "$n" ;; + *.lzma) unlzma ./"$n" ;; + *.bz2) bunzip2 ./"$n" ;; + *.rar) unrar x -ad ./"$n" ;; + *.gz) gunzip ./"$n" ;; + *.zip) unzip ./"$n" ;; + *.z) uncompress ./"$n" ;; + *.7z|*.arj|*.cab|*.chm|*.deb|*.dmg|*.iso|*.lzh|*.msi|*.rpm|*.udf|*.wim|*.xar) + 7z x ./"$n" ;; + *.xz) unxz ./"$n" ;; + *.exe) cabextract ./"$n" ;; + *) + echo "extract: '$n' - unknown archive method" + return 1 + ;; + esac + else + echo "'$n' - file does not exist" + return 1 + fi + done +fi +} diff --git a/flake.nix b/flake.nix index 31f3603..66e888c 100644 --- a/flake.nix +++ b/flake.nix @@ -63,22 +63,21 @@ ./machines/katana.nix #machine specific configuration "speccon18" #default user [ - hyprland.nixosModules.default - {programs.hyprland.enable = true;} + # hyprland.nixosModules.default + # ./modules/system/desktop-environments/hyprland.nix ./hosts/katana/default.nix ./hosts/katana/networkd.nix ./hosts/katana/system-pkgs.nix ./modules/system/services/docker.nix ./modules/system/services/openssh.nix ./modules/system/desktop-environments/gnome.nix - ./modules/system/desktop-environments/hyprland.nix ./modules/system/services/syncthing.nix ./modules/system/services/tailscale.nix ] #extra modules to load [ hyprland.homeManagerModules.default - ./modules/home-manager/hyprland.nix + # ./modules/home-manager/hyprland.nix ./modules/home-manager/helix.nix ./modules/home-manager/alacritty.nix ./modules/home-manager/vscode.nix diff --git a/hosts/katana/system-pkgs.nix b/hosts/katana/system-pkgs.nix index 73d4b39..e4da837 100644 --- a/hosts/katana/system-pkgs.nix +++ b/hosts/katana/system-pkgs.nix @@ -1,19 +1,18 @@ { modulesPath, config, pkgs, lib, self, ... }: { environment.systemPackages = with pkgs; [ + pkg-config ripgrep + openssl tree - cargo unrar unzip gzip p7zip bzip2 dconf2nix - rustc bat exa - mdbook uutils-coreutils htop zsh @@ -24,5 +23,6 @@ direnv #used for development environments python39 gcc + bottom ]; } \ No newline at end of file diff --git a/modules/home-manager/eww.nix b/modules/home-manager/eww.nix deleted file mode 100644 index 270c708..0000000 --- a/modules/home-manager/eww.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - programs.eww = { - enable=false; - configDir=../../dotfiles/eww; - }; -} \ No newline at end of file diff --git a/modules/home-manager/hyprland.nix b/modules/home-manager/hyprland.nix index e7990b2..a8245b3 100644 --- a/modules/home-manager/hyprland.nix +++ b/modules/home-manager/hyprland.nix @@ -5,6 +5,9 @@ extraConfig = '' bind = SUPER, Return, exec, alacritty bind = CONTROL_SHIFT, W, exec, firefox + bind = CONTROL_SHIFT, Lm, exec, rofi -show drun + exec-once=/usr/lib/polkit-kde-authentication-agent-1 + exec-once=waybar ''; }; } diff --git a/modules/home-manager/starship.nix b/modules/home-manager/starship.nix index ff0b8b6..f0a07ee 100644 --- a/modules/home-manager/starship.nix +++ b/modules/home-manager/starship.nix @@ -3,6 +3,5 @@ programs.starship = { enable = true; enableZshIntegration = true; - enableNushellIntegration = false; }; } \ No newline at end of file diff --git a/modules/home-manager/syncthing.nix b/modules/home-manager/syncthing.nix index 94c102f..2bc4db8 100644 --- a/modules/home-manager/syncthing.nix +++ b/modules/home-manager/syncthing.nix @@ -2,6 +2,6 @@ { services.syncthing = { enable = true; - tray.enable = true; + tray.enable = false; }; } \ No newline at end of file diff --git a/modules/home-manager/waybar.nix b/modules/home-manager/waybar.nix index 1750c0d..8982b36 100644 --- a/modules/home-manager/waybar.nix +++ b/modules/home-manager/waybar.nix @@ -1,4 +1,4 @@ - { pkgs, config, lib, ...}: +{ pkgs, config, lib, ...}: { programs.waybar = { enable = true; @@ -7,22 +7,19 @@ main_bar = { layer = "top"; modules-left = [ - "custom/launcher" "cpu" "memory" - "custom/media" "tray" ]; - modules-center = []; + modules-center = [ + "clock" + ]; modules-right = [ - "custom/updates" - "custom/wallpaper" "backlight" "custom/pw-volume" - "clock" "battery" - "custom/power" ]; + "custom/pipewire" = { "exec" = "pw-volume status"; "return-type" = "json"; @@ -85,39 +82,6 @@ "format" = " {}%"; "max-length" = 10; }; - "custom/media" = { - "interval" = 30; - "format" = "{icon} {}"; - "return-type" = "json"; - "max-length" = 20; - "format-icons" = { - "spotify" = " "; - "default" = " "; - }; - "escape" = true; - "exec" = "$HOME/.config/system_scripts/mediaplayer.py 2> /dev/null"; - "on-click" = "playerctl play-pause"; - }; - "custom/launcher" = { - "format" = " "; - "on-click" = "rofi -show drun"; - "on-click-right" = "killall rofi"; - }; - "custom/power" = { - "format" = " "; - "on-click" = "bash ~/.config/rofi/leave/leave.sh"; - }; - "custom/updates" = { - "format" = "{} Update(s)"; - "exec" = "checkupdates | wc -l"; - "exec-if" = "[[ $(checkupdates | wc -l) != 0 ]]"; - "interval" = 15; - "on-click" = "alacritty -e paru -Syu && notify-send 'The system has been updated' "; - }; - "custom/wallpaper" = { - "format" = " "; - "on-click" = "bash ~/.config/system_scripts/pkill_bc"; - }; }; }; style = '' @@ -253,68 +217,6 @@ color: #B5E8E0; background: #161320; } - - #custom-launcher { - font-size: 24px; - margin-top: 6px; - margin-left: 8px; - padding-left: 10px; - padding-right: 5px; - border-radius: 10px; - transition: none; - color: #89DCEB; - background: #161320; - } - - #custom-power { - font-size: 20px; - margin-top: 6px; - margin-left: 8px; - margin-right: 8px; - padding-left: 10px; - padding-right: 5px; - margin-bottom: 0px; - border-radius: 10px; - transition: none; - color: #161320; - background: #F28FAD; - } - - #custom-wallpaper { - margin-top: 6px; - margin-left: 8px; - padding-left: 10px; - padding-right: 10px; - margin-bottom: 0px; - border-radius: 10px; - transition: none; - color: #161320; - background: #C9CBFF; - } - - #custom-updates { - margin-top: 6px; - margin-left: 8px; - padding-left: 10px; - padding-right: 10px; - margin-bottom: 0px; - border-radius: 10px; - transition: none; - color: #161320; - background: #E8A2AF; - } - - #custom-media { - margin-top: 6px; - margin-left: 8px; - padding-left: 10px; - padding-right: 10px; - margin-bottom: 0px; - border-radius: 10px; - transition: none; - color: #161320; - background: #F2CDCD; - } ''; }; } \ No newline at end of file diff --git a/modules/home-manager/zoxide.nix b/modules/home-manager/zoxide.nix index a22f922..f2ddb01 100644 --- a/modules/home-manager/zoxide.nix +++ b/modules/home-manager/zoxide.nix @@ -3,6 +3,5 @@ programs.zoxide = { enable = true; enableZshIntegration = lib.mkDefault true; -# enableNushellIntegration = false; }; } \ No newline at end of file diff --git a/modules/home-manager/zsh.nix b/modules/home-manager/zsh.nix index 9f508d2..a00dd15 100644 --- a/modules/home-manager/zsh.nix +++ b/modules/home-manager/zsh.nix @@ -14,12 +14,10 @@ ls = "exa -l"; lsa = "exa -al"; cd = "z"; - osrb = "sudo nixos-rebuild $1 --flake ~/code/nix/nixos-config/#creatorforge-framework"; + osrb = "sudo nixos-rebuild $1 --flake ~/code/nixos-config/#katana"; zel = "zellij -s"; - ns = "nix-shell"; top = "btm"; - hx = "hx"; - cat = "bat"; + cat = "bat --decorations=never"; extract = "~/.config/zsh/extract.sh"; }; localVariables = { diff --git a/modules/system/desktop-environments/gnome.nix b/modules/system/desktop-environments/gnome.nix index 7474831..1e2163f 100644 --- a/modules/system/desktop-environments/gnome.nix +++ b/modules/system/desktop-environments/gnome.nix @@ -4,9 +4,9 @@ environment.systemPackages = with pkgs; [ gnomeExtensions.dock-from-dash gnomeExtensions.pop-shell - gnome.gnome-tweaks gnome-extension-manager ]; + services = { gnome = { core-utilities.enable = false; @@ -35,7 +35,7 @@ xwayland.enable = lib.mkDefault true; }; - xdg= { + xdg = { portal = { enable = lib.mkDefault true; }; mime.defaultApplications = { "text/markdown" = "hx"; diff --git a/modules/system/desktop-environments/hyprland.nix b/modules/system/desktop-environments/hyprland.nix index 622af24..9251742 100644 --- a/modules/system/desktop-environments/hyprland.nix +++ b/modules/system/desktop-environments/hyprland.nix @@ -1,11 +1,29 @@ { config, pkgs, lib, ... }: { - environment.systemPackages = with pkgs; [ - libsForQt5.polkit-kde-agent - libsForQt5.qt5.qtwayland - qt6.qtwayland - waybar - swww - pw-volume - ]; + programs.hyprland = { + enable = true; + nvidiaPatches = true; + xwayland.enable = true; + }; + environment = { + systemPackages = with pkgs; [ + libsForQt5.polkit-kde-agent + libsForQt5.qt5.qtwayland + qt6.qtwayland + waybar + swww + pw-volume + rofi-wayland + libnotify + mako + ]; + sessionVariables = { + WLR_NO_HARDWARE_CURSORS = "1"; + NIXOS_OZONE_WL = "1"; + }; + }; + hardware = { +# opengl.enable = true; + nvidia.modesetting.enable = true; + }; } \ No newline at end of file diff --git a/modules/system/desktop-environments/wayfire.nix b/modules/system/desktop-environments/wayfire.nix deleted file mode 100644 index 3373d70..0000000 --- a/modules/system/desktop-environments/wayfire.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ config, pkgs, lib, ... }: -{ - environment.systemPackages = with pkgs; [ - inputs.nixpkgs-wayland.packages.${system}.wayfire-unstable - ]; -} \ No newline at end of file diff --git a/users/speccon18/default.nix b/users/speccon18/default.nix index 838a764..767bd70 100644 --- a/users/speccon18/default.nix +++ b/users/speccon18/default.nix @@ -6,10 +6,12 @@ isNormalUser = true; initialHashedPassword = "$y$j9T$RdLBHOvUpb17egl0d16LT/$3Y2RD/tT1IZ0nkfAR13pp3IzBjvKLRgGpDPLobUeO23"; openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILdigmndcdQD/864P059K2hZOXyEkbGvMkH0/b2QavkD speccon18@creatorforge" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPc1AQ6hcjdSZZuhS5SISwtulFoTLpC5f5JoMFQkZ5l2 specCon18@DESKTOP-Q1I2PAE" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIrZpH5QV62dtTb2yx5I3PF2lJyNpPkV57pDlo6xawID" ]; description = "Steven Carpenter"; - extraGroups = [ "wheel" "docker" ]; + extraGroups = [ + "wheel" + "docker" + ]; }; } \ No newline at end of file diff --git a/users/speccon18/home.nix b/users/speccon18/home.nix index b70877c..c601d6a 100644 --- a/users/speccon18/home.nix +++ b/users/speccon18/home.nix @@ -7,21 +7,17 @@ packages = with pkgs; [ inkscape freecad - prismlauncher calibre bitwarden firefox discord - nodejs-18_x - fira-code + nodejs-20_x gimp obsidian neofetch vlc remmina bacon - bottom - broot ]; }; }