Merge pull request #19 from caperren/working-branch

Fix kitty accidentally launching glances

modules/application-groups/media.nix

@@ -27,6 +27,7 @@
 
   environment.systemPackages = with pkgs; [
     glava
+    gimp
     imv
     plex-desktop
     projectm_3

modules/application-groups/programming.nix

@@ -1,19 +1,4 @@
 { config, pkgs, ... }:
-let
-  jetbrainsToolboxDesktopEntry = pkgs.writeTextFile {
-    name = "jetbrains-toolbox-desktop";
-    destination = "/share/applications/jetbrains-toolbox.desktop";
-    text = ''
-      [Desktop Entry]
-      Type=Application
-      Name=JetBrains Toolbox
-      Exec=jetbrains-toolbox
-      Icon=jetbrains-toolbox
-      Terminal=false
-      Categories=Development;IDE;
-    '';
-  };
-in
 {
   environment.systemPackages = with pkgs; [
     arduino-ide
@@ -21,7 +6,6 @@ in
     gcc
     gnumake
     jetbrains-toolbox
-    jetbrainsToolboxDesktopEntry
     nix-update
     nixfmt-rfc-style
     nixos-generators

modules/application-groups/system-utilities.nix

@@ -1,23 +1,22 @@
 { config, pkgs, ... }:
 {
+  hardware.keyboard.qmk.enable = true;
+  hardware.logitech.wireless.enable = true;
+  hardware.logitech.wireless.enableGraphical = true;
+
   programs.thunar.enable = true;
   programs.thunar.plugins = with pkgs.xfce; [
     thunar-archive-plugin
     thunar-volman
   ];
-  services.gvfs.enable = true; # Mount, trash, and other functionalities
-  services.tumbler.enable = true; # Thumbnail support for images
-
   programs.ydotool.enable = true;
 
+  services.glances.enable = true;
+  services.gvfs.enable = true; # Mount, trash, and other functionalities
+  services.hardware.openrgb.enable = true;
   services.openssh.enable = true;
   services.printing.enable = true;
-
+  services.tumbler.enable = true; # Thumbnail support for images
-  hardware.logitech.wireless.enable = true;
-  hardware.logitech.wireless.enableGraphical = true;
-  hardware.keyboard.qmk.enable = true;
-
-  services.hardware.openrgb.enable = true;
 
   environment.systemPackages = with pkgs; [
     btop-cuda

users/caperren/caperren.nix

@@ -39,20 +39,34 @@ in
       };
 
     };
-
+    programs.bash.enable = true;
     programs.bemenu.enable = true;
 
     programs.kitty = {
       font.name = "JetBrains Mono";
     };
 
+    # Assets
+    home.file.".config/streamdeck-ui/icons".source = ./dotfiles/streamdeck/icons;
+
     # Application config files
+    home.file.".config/glances/glances.conf".source = ./dotfiles/.config/glances/glances.conf;
     home.file.".config/hypr/hypridle.conf".source = ./dotfiles/hypridle/hypridle.conf;
     home.file.".config/hypr/hyprpaper.conf".source = ./dotfiles/hyprpaper/hyprpaper.conf;
     home.file.".config/hypr/backgrounds/black.png".source = ./dotfiles/hyprpaper/backgrounds/black.png;
     home.file.".config/hypr/hyprland-common.conf".source = ./dotfiles/hyprland/hyprland-common.conf;
     home.file.".config/hypr/hyprland.conf".source = hyprlandConfigPath + "/hyprland.conf";
     home.file.".config/kanshi/config".source = kanshiConfigPath + "/config";
+    home.file.".config/streamdeck-ui/.streamdeck_ui_link.json" = {
+      source = ./dotfiles/streamdeck/.streamdeck_ui.json;
+      # Copy the symlinked version to its final location, otherwise it has no write permissions
+      # on the config file, which breaks the entire app
+      onChange = ''
+        cat ~/.config/streamdeck-ui/.streamdeck_ui_link.json > ~/.streamdeck_ui.json
+        chmod 600 ~/.streamdeck_ui.json
+      '';
+      force = true;
+    };
     home.file.".config/spotify-player/app.toml".text = spotifyPlayerAppTomlText;
     home.file.".config/waybar/config".source = waybarConfigPath + "/config";
     home.file.".config/waybar/style.css".source = ./dotfiles/waybar/style.css;
@@ -60,9 +74,18 @@ in
 
     # Desktop entry files so bemenu can find them
     home.file.".local/share/glava.desktop".source = ./dotfiles/.local/share/glava.desktop;
+    home.file.".local/share/jetbrains-toolbox.desktop".source =
+      ./dotfiles/.local/share/jetbrains-toolbox.desktop;
     home.file.".local/share/spotify-player.desktop".source =
       ./dotfiles/.local/share/spotify-player.desktop;
 
+    # Custom bash aliases
+    home.shellAliases = {
+        # Streamdeck isn't easy to manually edit, so make a save command to copy any updates to the repo
+        savestreamdeck = "cp ~/.streamdeck_ui.json ~/.nixos-configs/users/caperren/dotfiles/streamdeck/.streamdeck_ui.json";
+    };
+
+    # Theming
     gtk = {
       enable = true;
 

users/caperren/dotfiles/.config/glances/glances.conf

@@ -0,0 +1,44 @@
+##############################################################################
+# Custom Glances Configuration Overrides
+##############################################################################
+[global]
+# Managed by NixOS configs
+check_update=false
+
+[percpu]
+# All of my systems are 16 core
+max_cpu_display=16
+
+[ip]
+# Useful for validating vpn connectivity
+public_disabled=False
+public_refresh_interval=300
+public_api=https://ipv4.ipleak.net/json/
+public_field=ip
+public_template={continent_code}/{country_code}/{region_code}/{city_name}/{isp_name}
+
+[diskio]
+# Don't care about loop devices
+hide=loop.*,/dev/loop.*
+
+[smart]
+disable=False
+
+[fs]
+# Nix store is duplicate of / on NixOS
+hide=/nix/store
+
+# Leaving this all commented for now as it doesn't like large number of files
+#[folders]
+# Home overview is helpful
+#folder_1_path=/home/caperren
+#folder_1_refresh=120
+# Steam is normally the largest
+#folder_2_path=/home/caperren/.local/share/Steam
+#folder_2_refresh=120
+# Then Downloads next
+#folder_3_path=/home/caperren/Downloads
+#folder_3_refresh=120
+# With code generally coming last
+#folder_4_path=/home/caperren/code
+#folder_4_refresh=120

users/caperren/dotfiles/.local/share/jetbrains-toolbox.desktop

@@ -0,0 +1,7 @@
+[Desktop Entry]
+Type=Application
+Name=JetBrains Toolbox
+Exec=jetbrains-toolbox
+Icon=jetbrains-toolbox
+Terminal=false
+Categories=Development;IDE;