From 3652381567a47c28e90a632e6bf55e6eb61e7d99 Mon Sep 17 00:00:00 2001 From: Nate Anderson Date: Fri, 12 Jan 2024 16:18:45 -0700 Subject: [PATCH] Added dotfiles and hardware to user-specific folders --- dotfiles/{ => nate}/Passwords.kdbx | Bin dotfiles/{ => nate}/foot/foot.ini | 0 dotfiles/{ => nate}/helix/config.toml | 0 dotfiles/{ => nate}/helix/languages.toml | 0 dotfiles/{ => nate}/kak-lsp/kak-lsp.toml | 0 .../kak/colors/catppuccin_frappe.kak | 0 .../kak/colors/catppuccin_latte.kak | 0 .../kak/colors/catppuccin_macchiato.kak | 0 .../kak/colors/catppuccin_mocha.kak | 0 dotfiles/{ => nate}/kak/kakrc | 0 dotfiles/{ => nate}/kak/rc/fzf_git.kak | 0 dotfiles/{ => nate}/keepassxc/keepassxc.ini | 0 dotfiles/{ => nate}/kitty/kitty.conf | 0 dotfiles/{ => nate}/mako/config | 0 dotfiles/{ => nate}/sway/background.pid | 0 dotfiles/{ => nate}/sway/cheatsheet | 0 dotfiles/{ => nate}/sway/config | 0 .../sway/config.d/application_defaults | 0 .../sway/config.d/autostart_applications | 0 dotfiles/{ => nate}/sway/config.d/clamshell | 0 dotfiles/{ => nate}/sway/config.d/default | 0 dotfiles/{ => nate}/sway/config.d/input | 0 dotfiles/{ => nate}/sway/config.d/output | 0 dotfiles/{ => nate}/sway/config.d/theme | 0 dotfiles/{ => nate}/sway/keyboard.conf | 0 .../{ => nate}/sway/scripts/background.pid | 0 .../{ => nate}/sway/scripts/background.sh | 0 dotfiles/{ => nate}/sway/scripts/clamshell.sh | 0 .../{ => nate}/sway/scripts/import-gsettings | 0 dotfiles/{ => nate}/sway/scripts/lockman.sh | 0 dotfiles/{ => nate}/sway/scripts/scale.sh | 0 .../{ => nate}/sway/scripts/screenshot.sh | 0 dotfiles/{ => nate}/sway/scripts/swayfader.py | 0 dotfiles/{ => nate}/sway/scripts/weather.sh | 0 dotfiles/{ => nate}/sway/swaylock.png | Bin .../Macchiato-hald8-archlinux.png.png | Bin .../Macchiato-hald8-gnu-linux.png.png | Bin .../Macchiato-hald8-ign-0000.png.png | Bin .../Macchiato-hald8-ign_astronaut.png.png | Bin .../Macchiato-hald8-ign_black.jpg.jpg | Bin .../Macchiato-hald8-ign_vaporWave.png.png | Bin .../wallpapers/Macchiato-hald8-waves.jpg.jpg | Bin dotfiles/{ => nate}/waybar/config | 0 .../{ => nate}/waybar/scripts/PBPbattery.sh | 0 .../waybar/scripts/keyboard_layout.sh | 0 dotfiles/{ => nate}/waybar/scripts/keyhint.sh | 0 .../{ => nate}/waybar/scripts/power-menu.sh | 0 dotfiles/{ => nate}/waybar/scripts/weather.sh | 0 dotfiles/{ => nate}/waybar/style.css | 0 dotfiles/{ => nate}/wofi/config | 0 dotfiles/{ => nate}/wofi/config.power | 0 dotfiles/{ => nate}/wofi/config.screenshot | 0 dotfiles/{ => nate}/wofi/style.css | 0 dotfiles/{ => nate}/wofi/style.widgets.css | 0 dotfiles/{ => nate}/wofi/windows.py | 0 flake.nix | 2 +- modules/apps/firefox/firefox.nix | 2 +- modules/home-manager/home.nix | 95 ++++++++++++------ modules/sway/sway_conf.nix | 21 ++-- modules/user/.main_user.nix.kak.pLou1v | 52 ---------- nixos/desktop_configuration.nix | 64 +----------- nixos/{ => nate}/hardware-configuration.nix | 0 62 files changed, 78 insertions(+), 158 deletions(-) rename dotfiles/{ => nate}/Passwords.kdbx (100%) rename dotfiles/{ => nate}/foot/foot.ini (100%) rename dotfiles/{ => nate}/helix/config.toml (100%) rename dotfiles/{ => nate}/helix/languages.toml (100%) rename dotfiles/{ => nate}/kak-lsp/kak-lsp.toml (100%) rename dotfiles/{ => nate}/kak/colors/catppuccin_frappe.kak (100%) rename dotfiles/{ => nate}/kak/colors/catppuccin_latte.kak (100%) rename dotfiles/{ => nate}/kak/colors/catppuccin_macchiato.kak (100%) rename dotfiles/{ => nate}/kak/colors/catppuccin_mocha.kak (100%) rename dotfiles/{ => nate}/kak/kakrc (100%) rename dotfiles/{ => nate}/kak/rc/fzf_git.kak (100%) rename dotfiles/{ => nate}/keepassxc/keepassxc.ini (100%) rename dotfiles/{ => nate}/kitty/kitty.conf (100%) rename dotfiles/{ => nate}/mako/config (100%) rename dotfiles/{ => nate}/sway/background.pid (100%) rename dotfiles/{ => nate}/sway/cheatsheet (100%) rename dotfiles/{ => nate}/sway/config (100%) rename dotfiles/{ => nate}/sway/config.d/application_defaults (100%) rename dotfiles/{ => nate}/sway/config.d/autostart_applications (100%) rename dotfiles/{ => nate}/sway/config.d/clamshell (100%) rename dotfiles/{ => nate}/sway/config.d/default (100%) rename dotfiles/{ => nate}/sway/config.d/input (100%) rename dotfiles/{ => nate}/sway/config.d/output (100%) rename dotfiles/{ => nate}/sway/config.d/theme (100%) rename dotfiles/{ => nate}/sway/keyboard.conf (100%) rename dotfiles/{ => nate}/sway/scripts/background.pid (100%) rename dotfiles/{ => nate}/sway/scripts/background.sh (100%) rename dotfiles/{ => nate}/sway/scripts/clamshell.sh (100%) rename dotfiles/{ => nate}/sway/scripts/import-gsettings (100%) rename dotfiles/{ => nate}/sway/scripts/lockman.sh (100%) rename dotfiles/{ => nate}/sway/scripts/scale.sh (100%) rename dotfiles/{ => nate}/sway/scripts/screenshot.sh (100%) rename dotfiles/{ => nate}/sway/scripts/swayfader.py (100%) rename dotfiles/{ => nate}/sway/scripts/weather.sh (100%) rename dotfiles/{ => nate}/sway/swaylock.png (100%) rename dotfiles/{ => nate}/sway/wallpapers/Macchiato-hald8-archlinux.png.png (100%) rename dotfiles/{ => nate}/sway/wallpapers/Macchiato-hald8-gnu-linux.png.png (100%) rename dotfiles/{ => nate}/sway/wallpapers/Macchiato-hald8-ign-0000.png.png (100%) rename dotfiles/{ => nate}/sway/wallpapers/Macchiato-hald8-ign_astronaut.png.png (100%) rename dotfiles/{ => nate}/sway/wallpapers/Macchiato-hald8-ign_black.jpg.jpg (100%) rename dotfiles/{ => nate}/sway/wallpapers/Macchiato-hald8-ign_vaporWave.png.png (100%) rename dotfiles/{ => nate}/sway/wallpapers/Macchiato-hald8-waves.jpg.jpg (100%) rename dotfiles/{ => nate}/waybar/config (100%) rename dotfiles/{ => nate}/waybar/scripts/PBPbattery.sh (100%) rename dotfiles/{ => nate}/waybar/scripts/keyboard_layout.sh (100%) rename dotfiles/{ => nate}/waybar/scripts/keyhint.sh (100%) rename dotfiles/{ => nate}/waybar/scripts/power-menu.sh (100%) rename dotfiles/{ => nate}/waybar/scripts/weather.sh (100%) rename dotfiles/{ => nate}/waybar/style.css (100%) rename dotfiles/{ => nate}/wofi/config (100%) rename dotfiles/{ => nate}/wofi/config.power (100%) rename dotfiles/{ => nate}/wofi/config.screenshot (100%) rename dotfiles/{ => nate}/wofi/style.css (100%) rename dotfiles/{ => nate}/wofi/style.widgets.css (100%) rename dotfiles/{ => nate}/wofi/windows.py (100%) delete mode 100644 modules/user/.main_user.nix.kak.pLou1v rename nixos/{ => nate}/hardware-configuration.nix (100%) diff --git a/dotfiles/Passwords.kdbx b/dotfiles/nate/Passwords.kdbx similarity index 100% rename from dotfiles/Passwords.kdbx rename to dotfiles/nate/Passwords.kdbx diff --git a/dotfiles/foot/foot.ini b/dotfiles/nate/foot/foot.ini similarity index 100% rename from dotfiles/foot/foot.ini rename to dotfiles/nate/foot/foot.ini diff --git a/dotfiles/helix/config.toml b/dotfiles/nate/helix/config.toml similarity index 100% rename from dotfiles/helix/config.toml rename to dotfiles/nate/helix/config.toml diff --git a/dotfiles/helix/languages.toml b/dotfiles/nate/helix/languages.toml similarity index 100% rename from dotfiles/helix/languages.toml rename to dotfiles/nate/helix/languages.toml diff --git a/dotfiles/kak-lsp/kak-lsp.toml b/dotfiles/nate/kak-lsp/kak-lsp.toml similarity index 100% rename from dotfiles/kak-lsp/kak-lsp.toml rename to dotfiles/nate/kak-lsp/kak-lsp.toml diff --git a/dotfiles/kak/colors/catppuccin_frappe.kak b/dotfiles/nate/kak/colors/catppuccin_frappe.kak similarity index 100% rename from dotfiles/kak/colors/catppuccin_frappe.kak rename to dotfiles/nate/kak/colors/catppuccin_frappe.kak diff --git a/dotfiles/kak/colors/catppuccin_latte.kak b/dotfiles/nate/kak/colors/catppuccin_latte.kak similarity index 100% rename from dotfiles/kak/colors/catppuccin_latte.kak rename to dotfiles/nate/kak/colors/catppuccin_latte.kak diff --git a/dotfiles/kak/colors/catppuccin_macchiato.kak b/dotfiles/nate/kak/colors/catppuccin_macchiato.kak similarity index 100% rename from dotfiles/kak/colors/catppuccin_macchiato.kak rename to dotfiles/nate/kak/colors/catppuccin_macchiato.kak diff --git a/dotfiles/kak/colors/catppuccin_mocha.kak b/dotfiles/nate/kak/colors/catppuccin_mocha.kak similarity index 100% rename from dotfiles/kak/colors/catppuccin_mocha.kak rename to dotfiles/nate/kak/colors/catppuccin_mocha.kak diff --git a/dotfiles/kak/kakrc b/dotfiles/nate/kak/kakrc similarity index 100% rename from dotfiles/kak/kakrc rename to dotfiles/nate/kak/kakrc diff --git a/dotfiles/kak/rc/fzf_git.kak b/dotfiles/nate/kak/rc/fzf_git.kak similarity index 100% rename from dotfiles/kak/rc/fzf_git.kak rename to dotfiles/nate/kak/rc/fzf_git.kak diff --git a/dotfiles/keepassxc/keepassxc.ini b/dotfiles/nate/keepassxc/keepassxc.ini similarity index 100% rename from dotfiles/keepassxc/keepassxc.ini rename to dotfiles/nate/keepassxc/keepassxc.ini diff --git a/dotfiles/kitty/kitty.conf b/dotfiles/nate/kitty/kitty.conf similarity index 100% rename from dotfiles/kitty/kitty.conf rename to dotfiles/nate/kitty/kitty.conf diff --git a/dotfiles/mako/config b/dotfiles/nate/mako/config similarity index 100% rename from dotfiles/mako/config rename to dotfiles/nate/mako/config diff --git a/dotfiles/sway/background.pid b/dotfiles/nate/sway/background.pid similarity index 100% rename from dotfiles/sway/background.pid rename to dotfiles/nate/sway/background.pid diff --git a/dotfiles/sway/cheatsheet b/dotfiles/nate/sway/cheatsheet similarity index 100% rename from dotfiles/sway/cheatsheet rename to dotfiles/nate/sway/cheatsheet diff --git a/dotfiles/sway/config b/dotfiles/nate/sway/config similarity index 100% rename from dotfiles/sway/config rename to dotfiles/nate/sway/config diff --git a/dotfiles/sway/config.d/application_defaults b/dotfiles/nate/sway/config.d/application_defaults similarity index 100% rename from dotfiles/sway/config.d/application_defaults rename to dotfiles/nate/sway/config.d/application_defaults diff --git a/dotfiles/sway/config.d/autostart_applications b/dotfiles/nate/sway/config.d/autostart_applications similarity index 100% rename from dotfiles/sway/config.d/autostart_applications rename to dotfiles/nate/sway/config.d/autostart_applications diff --git a/dotfiles/sway/config.d/clamshell b/dotfiles/nate/sway/config.d/clamshell similarity index 100% rename from dotfiles/sway/config.d/clamshell rename to dotfiles/nate/sway/config.d/clamshell diff --git a/dotfiles/sway/config.d/default b/dotfiles/nate/sway/config.d/default similarity index 100% rename from dotfiles/sway/config.d/default rename to dotfiles/nate/sway/config.d/default diff --git a/dotfiles/sway/config.d/input b/dotfiles/nate/sway/config.d/input similarity index 100% rename from dotfiles/sway/config.d/input rename to dotfiles/nate/sway/config.d/input diff --git a/dotfiles/sway/config.d/output b/dotfiles/nate/sway/config.d/output similarity index 100% rename from dotfiles/sway/config.d/output rename to dotfiles/nate/sway/config.d/output diff --git a/dotfiles/sway/config.d/theme b/dotfiles/nate/sway/config.d/theme similarity index 100% rename from dotfiles/sway/config.d/theme rename to dotfiles/nate/sway/config.d/theme diff --git a/dotfiles/sway/keyboard.conf b/dotfiles/nate/sway/keyboard.conf similarity index 100% rename from dotfiles/sway/keyboard.conf rename to dotfiles/nate/sway/keyboard.conf diff --git a/dotfiles/sway/scripts/background.pid b/dotfiles/nate/sway/scripts/background.pid similarity index 100% rename from dotfiles/sway/scripts/background.pid rename to dotfiles/nate/sway/scripts/background.pid diff --git a/dotfiles/sway/scripts/background.sh b/dotfiles/nate/sway/scripts/background.sh similarity index 100% rename from dotfiles/sway/scripts/background.sh rename to dotfiles/nate/sway/scripts/background.sh diff --git a/dotfiles/sway/scripts/clamshell.sh b/dotfiles/nate/sway/scripts/clamshell.sh similarity index 100% rename from dotfiles/sway/scripts/clamshell.sh rename to dotfiles/nate/sway/scripts/clamshell.sh diff --git a/dotfiles/sway/scripts/import-gsettings b/dotfiles/nate/sway/scripts/import-gsettings similarity index 100% rename from dotfiles/sway/scripts/import-gsettings rename to dotfiles/nate/sway/scripts/import-gsettings diff --git a/dotfiles/sway/scripts/lockman.sh b/dotfiles/nate/sway/scripts/lockman.sh similarity index 100% rename from dotfiles/sway/scripts/lockman.sh rename to dotfiles/nate/sway/scripts/lockman.sh diff --git a/dotfiles/sway/scripts/scale.sh b/dotfiles/nate/sway/scripts/scale.sh similarity index 100% rename from dotfiles/sway/scripts/scale.sh rename to dotfiles/nate/sway/scripts/scale.sh diff --git a/dotfiles/sway/scripts/screenshot.sh b/dotfiles/nate/sway/scripts/screenshot.sh similarity index 100% rename from dotfiles/sway/scripts/screenshot.sh rename to dotfiles/nate/sway/scripts/screenshot.sh diff --git a/dotfiles/sway/scripts/swayfader.py b/dotfiles/nate/sway/scripts/swayfader.py similarity index 100% rename from dotfiles/sway/scripts/swayfader.py rename to dotfiles/nate/sway/scripts/swayfader.py diff --git a/dotfiles/sway/scripts/weather.sh b/dotfiles/nate/sway/scripts/weather.sh similarity index 100% rename from dotfiles/sway/scripts/weather.sh rename to dotfiles/nate/sway/scripts/weather.sh diff --git a/dotfiles/sway/swaylock.png b/dotfiles/nate/sway/swaylock.png similarity index 100% rename from dotfiles/sway/swaylock.png rename to dotfiles/nate/sway/swaylock.png diff --git a/dotfiles/sway/wallpapers/Macchiato-hald8-archlinux.png.png b/dotfiles/nate/sway/wallpapers/Macchiato-hald8-archlinux.png.png similarity index 100% rename from dotfiles/sway/wallpapers/Macchiato-hald8-archlinux.png.png rename to dotfiles/nate/sway/wallpapers/Macchiato-hald8-archlinux.png.png diff --git a/dotfiles/sway/wallpapers/Macchiato-hald8-gnu-linux.png.png b/dotfiles/nate/sway/wallpapers/Macchiato-hald8-gnu-linux.png.png similarity index 100% rename from dotfiles/sway/wallpapers/Macchiato-hald8-gnu-linux.png.png rename to dotfiles/nate/sway/wallpapers/Macchiato-hald8-gnu-linux.png.png diff --git a/dotfiles/sway/wallpapers/Macchiato-hald8-ign-0000.png.png b/dotfiles/nate/sway/wallpapers/Macchiato-hald8-ign-0000.png.png similarity index 100% rename from dotfiles/sway/wallpapers/Macchiato-hald8-ign-0000.png.png rename to dotfiles/nate/sway/wallpapers/Macchiato-hald8-ign-0000.png.png diff --git a/dotfiles/sway/wallpapers/Macchiato-hald8-ign_astronaut.png.png b/dotfiles/nate/sway/wallpapers/Macchiato-hald8-ign_astronaut.png.png similarity index 100% rename from dotfiles/sway/wallpapers/Macchiato-hald8-ign_astronaut.png.png rename to dotfiles/nate/sway/wallpapers/Macchiato-hald8-ign_astronaut.png.png diff --git a/dotfiles/sway/wallpapers/Macchiato-hald8-ign_black.jpg.jpg b/dotfiles/nate/sway/wallpapers/Macchiato-hald8-ign_black.jpg.jpg similarity index 100% rename from dotfiles/sway/wallpapers/Macchiato-hald8-ign_black.jpg.jpg rename to dotfiles/nate/sway/wallpapers/Macchiato-hald8-ign_black.jpg.jpg diff --git a/dotfiles/sway/wallpapers/Macchiato-hald8-ign_vaporWave.png.png b/dotfiles/nate/sway/wallpapers/Macchiato-hald8-ign_vaporWave.png.png similarity index 100% rename from dotfiles/sway/wallpapers/Macchiato-hald8-ign_vaporWave.png.png rename to dotfiles/nate/sway/wallpapers/Macchiato-hald8-ign_vaporWave.png.png diff --git a/dotfiles/sway/wallpapers/Macchiato-hald8-waves.jpg.jpg b/dotfiles/nate/sway/wallpapers/Macchiato-hald8-waves.jpg.jpg similarity index 100% rename from dotfiles/sway/wallpapers/Macchiato-hald8-waves.jpg.jpg rename to dotfiles/nate/sway/wallpapers/Macchiato-hald8-waves.jpg.jpg diff --git a/dotfiles/waybar/config b/dotfiles/nate/waybar/config similarity index 100% rename from dotfiles/waybar/config rename to dotfiles/nate/waybar/config diff --git a/dotfiles/waybar/scripts/PBPbattery.sh b/dotfiles/nate/waybar/scripts/PBPbattery.sh similarity index 100% rename from dotfiles/waybar/scripts/PBPbattery.sh rename to dotfiles/nate/waybar/scripts/PBPbattery.sh diff --git a/dotfiles/waybar/scripts/keyboard_layout.sh b/dotfiles/nate/waybar/scripts/keyboard_layout.sh similarity index 100% rename from dotfiles/waybar/scripts/keyboard_layout.sh rename to dotfiles/nate/waybar/scripts/keyboard_layout.sh diff --git a/dotfiles/waybar/scripts/keyhint.sh b/dotfiles/nate/waybar/scripts/keyhint.sh similarity index 100% rename from dotfiles/waybar/scripts/keyhint.sh rename to dotfiles/nate/waybar/scripts/keyhint.sh diff --git a/dotfiles/waybar/scripts/power-menu.sh b/dotfiles/nate/waybar/scripts/power-menu.sh similarity index 100% rename from dotfiles/waybar/scripts/power-menu.sh rename to dotfiles/nate/waybar/scripts/power-menu.sh diff --git a/dotfiles/waybar/scripts/weather.sh b/dotfiles/nate/waybar/scripts/weather.sh similarity index 100% rename from dotfiles/waybar/scripts/weather.sh rename to dotfiles/nate/waybar/scripts/weather.sh diff --git a/dotfiles/waybar/style.css b/dotfiles/nate/waybar/style.css similarity index 100% rename from dotfiles/waybar/style.css rename to dotfiles/nate/waybar/style.css diff --git a/dotfiles/wofi/config b/dotfiles/nate/wofi/config similarity index 100% rename from dotfiles/wofi/config rename to dotfiles/nate/wofi/config diff --git a/dotfiles/wofi/config.power b/dotfiles/nate/wofi/config.power similarity index 100% rename from dotfiles/wofi/config.power rename to dotfiles/nate/wofi/config.power diff --git a/dotfiles/wofi/config.screenshot b/dotfiles/nate/wofi/config.screenshot similarity index 100% rename from dotfiles/wofi/config.screenshot rename to dotfiles/nate/wofi/config.screenshot diff --git a/dotfiles/wofi/style.css b/dotfiles/nate/wofi/style.css similarity index 100% rename from dotfiles/wofi/style.css rename to dotfiles/nate/wofi/style.css diff --git a/dotfiles/wofi/style.widgets.css b/dotfiles/nate/wofi/style.widgets.css similarity index 100% rename from dotfiles/wofi/style.widgets.css rename to dotfiles/nate/wofi/style.widgets.css diff --git a/dotfiles/wofi/windows.py b/dotfiles/nate/wofi/windows.py similarity index 100% rename from dotfiles/wofi/windows.py rename to dotfiles/nate/wofi/windows.py diff --git a/flake.nix b/flake.nix index 24d87b3..81a42ce 100644 --- a/flake.nix +++ b/flake.nix @@ -57,7 +57,7 @@ modules = [ ./nixos/desktop_configuration.nix # Setup nix-ld - nix-ld.nixosModules.nix-ld + # nix-ld.nixosModules.nix-ld # Setup home manager home-manager.nixosModules.home-manager { home-manager.useGlobalPkgs = true; diff --git a/modules/apps/firefox/firefox.nix b/modules/apps/firefox/firefox.nix index c4b205f..1b9dae5 100644 --- a/modules/apps/firefox/firefox.nix +++ b/modules/apps/firefox/firefox.nix @@ -30,7 +30,7 @@ in engines = { "Startpage" = { urls = [{ - template = "https://www.startpage.com/do/mypage.pl?prfe=a1ffaae1a3f4dc133b6e11b3d611db561598fc16fbc43a22c2694805a5b4d46852c848cb54f3ccbc9cea0e8e83dab567d3abe2b350870e7781f8701d4558a1c988aced444d1e8d8a7b830563/search?query={searchTerms}"; + template = "https://www.startpage.com/sp/search?query={searchTerms}"; }]; }; }; diff --git a/modules/home-manager/home.nix b/modules/home-manager/home.nix index f57b31c..9537e71 100644 --- a/modules/home-manager/home.nix +++ b/modules/home-manager/home.nix @@ -1,9 +1,5 @@ { inputs, outputs, lib, config, pkgs, userName, fullName, email, hostName, desktop, gaming, ... }: { - # Home Manager needs a bit of information about you and the paths it should - # manage. - # - # nixpkgs.overlays = [ # inputs.nur.overlay # ]; @@ -29,13 +25,71 @@ home.packages = with pkgs; [ # nur.repos.crazazy.js.eslint # inputs.nixpkgs-stable.legacyPackages.x86_64-linux.corectrl - # kakoune + + # + # Dev Tools + # + dbeaver + cargo + kakoune + # flutter + docker + docker-compose + python310 + nodejs_21 + zig + ### LSP's + rnix-lsp # Nix LSP + openscad-lsp + nodePackages.typescript-language-server + vscode-langservers-extracted # provides eslint, markdown, json, css, and html lsp + rubyPackages.solargraph + python310Packages.python-lsp-server + zls + ### Misc + # android-udev-rules + # android-tools + # sdkmanager + openscad + + # + # Gaming + # + wine-wayland + webcord + + # + # Better Unix + # + bat + duf + fd + fzf + lsd + ripgrep + gtop + + # + # Photo / Video + # + davinci-resolve-studio + imv + mpv + gimp + + # + # Communication + # + mumble + slack + signal-desktop + + # + # Other + # keepassxc obs-studio - signal-desktop - waybar - wofi - xfce.thunar + # Install fonts (nerdfonts.override { fonts = [ "Hermit" "Overpass" ]; }) @@ -58,7 +112,7 @@ # # the Nix store. Activating the configuration will then make '~/.screenrc' a # # symlink to the Nix store copy. # ".screenrc".source = dotfiles/screenrc; - source = ../../dotfiles; + source = ../../nate/dotfiles; recursive = true; # # You can also set the file content immediately. @@ -85,24 +139,6 @@ XDG_CURRENT_DESKTOP="sway"; }; - wayland.windowManager.sway = { - enable = true; - # config = rec { - # modifier = "Mod4"; - # terminal = "foot"; - # # startup = [ - # # {command = "firefox";} - # # ]; - # }; - }; - - - # kdeconnect setup - # services.kdeconnect = { - # enable = true; - # indicator = true; - # }; - # Git setup programs.git = { enable = true; @@ -113,9 +149,6 @@ # Zsh setup programs.zsh = { enable = true; - #history = { - # Size = 10000; - #}; oh-my-zsh = { enable = true; plugins = [ "git" ]; diff --git a/modules/sway/sway_conf.nix b/modules/sway/sway_conf.nix index 2ea88e0..99b4f06 100644 --- a/modules/sway/sway_conf.nix +++ b/modules/sway/sway_conf.nix @@ -22,14 +22,15 @@ ### ## Configuration ### - config = lib.mkIf config.swaywm.enable { + programs.sway.enable = true; + nixpkgs.config.allowUnfree = config.swaywm.useNonFree; # For R2ModMan - nixpkgs.config.permittedInsecurePackages = [ - "electron-25.9.0" - ]; + # nixpkgs.config.permittedInsecurePackages = [ + # "electron-25.9.0" + # ]; ### ## XDG portal setup @@ -70,11 +71,12 @@ swaylock swayidle wl-clipboard + waybar wdisplays + wofi xdg-utils zsh # Fonts - ] config.swaywm.systemPackages # (lib.mkIf config.swaywm.installGaming [ @@ -96,6 +98,9 @@ programs.zsh.enable = true; programs.steam.enable = config.swaywm.installGaming; + programs.adb.enable = true; + # kdeconnect setup + programs.kdeconnect.enable = true; ### ## Services @@ -109,9 +114,6 @@ pulse.enable = true; }; - # kdeconnect setup - programs.kdeconnect.enable = true; - ### ## Misc ### @@ -120,9 +122,8 @@ security.polkit.enable = true; hardware.opengl = { - enable = true; + enable = true; driSupport = true; }; - }; } diff --git a/modules/user/.main_user.nix.kak.pLou1v b/modules/user/.main_user.nix.kak.pLou1v deleted file mode 100644 index 4cbfc69..0000000 --- a/modules/user/.main_user.nix.kak.pLou1v +++ /dev/null @@ -1,52 +0,0 @@ -{ lib, config, pkgs, ... }: - -let - cfg = config.main_user; -in -{ - options.main_user = { - enable = lib.mkEnableOption "enable user module"; - - isDesktopUser = lib.mkOption { - default = false; - example = true; - description = "Add additional user groups for desktop users"; - }; - - userName = lib.mkOption { - default = "mainuser"; - description = "username"; - }; - }; - - config = lib.mkIf cfg.enable { - users.users.${cfg.userName} = lib.mkMerge [ - { - isNormalUser = true; - initialPassword = "password"; - - description = "main user"; - shell = pkgs.zsh; - } - - (lib.mkIf (!cfg.isDesktopUser) { - extraGroups = [ - "wheel" - "networkmanager" - cfg.userName - ]; - }) - (lib.mkIf cfg.isDesktopUser { - extraGroups = [ - "wheel" - "networkmanager" - "corectrl" - cfg.userName - "video" - "audio" - # For android - "adbusers" - ]; - }) - ]; - }; diff --git a/nixos/desktop_configuration.nix b/nixos/desktop_configuration.nix index 7e95f23..57ed600 100644 --- a/nixos/desktop_configuration.nix +++ b/nixos/desktop_configuration.nix @@ -1,7 +1,7 @@ { config, lib, inputs, outputs, pkgs, userName, hostName, desktop, timeZone, gaming, system, ... }: let - supportedDesktops = [ "sway" ]; + supportedDesktops = [ "sway" "kde" ]; supportedDesktopsStr = lib.strings.concatStringsSep ", " supportedDesktops; in { @@ -52,71 +52,9 @@ in useNonFree = true; installGaming = gaming; systemPackages = with pkgs; [ - # - # Dev Tools - # - dbeaver - cargo - kakoune - # flutter - docker - docker-compose - python310 - nodejs_21 - zig - ### LSP's - rnix-lsp # Nix LSP - openscad-lsp - nodePackages.typescript-language-server - vscode-langservers-extracted # provides eslint, markdown, json, css, and html lsp - rubyPackages.solargraph - python310Packages.python-lsp-server - zls - ### Misc - # android-udev-rules - # android-tools - # sdkmanager - openscad - - # - # Productivity - # libreoffice - - # - # Gaming - # - mumble - wine-wayland - r2modman - - # - # Better Unix - # - bat - duf - fd - fzf - lsd - ripgrep - gtop - - # - # Photo / Video - # - davinci-resolve-studio - imv - mpv - gimp - - # - # Work - # - slack ]; }; - - programs.adb.enable = true; system.stateVersion = "23.11"; # Did you read the comment? } diff --git a/nixos/hardware-configuration.nix b/nixos/nate/hardware-configuration.nix similarity index 100% rename from nixos/hardware-configuration.nix rename to nixos/nate/hardware-configuration.nix