Merge pull request #69 from redyf/dev

Dev

home/desktop/apps/default.nix → home/redyf/apps/default.nix

@@ -3,10 +3,12 @@ _: {
     # ./artix-game-launcher
     ./discord
     # ./davinci-resolve
+    ./emacs
     ./firefox
     ./insomnia
     ./misc
     ./obs
+    ./pom
     # ./vscode
   ];
 }

home/redyf/apps/emacs/default.nix

@@ -0,0 +1,10 @@
+{pkgs, ...}: {
+  programs.emacs = {
+    enable = true;
+    package = pkgs.emacs; # replace with pkgs.emacs-gtk, or a version provided by the community overlay if desired.
+  };
+  services.emacs = {
+    enable = true;
+    package = pkgs.emacs; # replace with emacs-gtk, or a version provided by the community overlay if desired.
+  };
+}

home/desktop/apps/misc/default.nix → home/redyf/apps/misc/default.nix

@@ -2,7 +2,7 @@
   # Requires https://github.com/caarlos0/timer to be installed. spd-say should ship with your distro (Thanks Bashbunni!)
   home.packages = with pkgs; [
     # Anime/Manga
-    ani-cli # A cli tool to browse and play anime
+    # ani-cli # A cli tool to browse and play anime
     # mangal # A fancy CLI app written in Go which scrapes, downloads and packs manga into different formats
 
     # Cloud
@@ -18,6 +18,7 @@
     obsidian
 
     # Other stuff
+    gh
     ollama
 
     # Rice
@@ -36,13 +37,10 @@
     vlc
 
     # System Utils
-    # mpd
     mpv
-    # peek # Animated GIF screen recorder
     glib
     xclip
     unzip # Unzip files using the terminal
-    # nerdfix # Fix obsolete nerd font icons
     tree-sitter # A parser generator tool and an incremental parsing library
     appimage-run # Run appimage files in the terminal
     polkit_gnome

home/redyf/apps/pom/default.nix

@@ -0,0 +1,7 @@
+{pkgs, ...}: {
+  home.packages = with pkgs; [
+    (pkgs.callPackage ../../../../pkgs/pom.nix {
+      src = pom; # pkg source is passed as a `specialArgs` and injected into this module.
+    })
+  ];
+}

home/desktop/cli-apps/starship/default.nix → home/redyf/cli-apps/starship/default.nix

@@ -11,7 +11,9 @@
         scan_timeout = 10;
         add_newline = false;
         line_break.disabled = false;
-        right_format = "$time";
+        right_format = ''
+          $all
+        '';
         character = {
           success_symbol = "[](#cbced3)";
           error_symbol = "[](#dd6777) ";
@@ -20,8 +22,13 @@
           format = "$symbol[λ ](bold #b4befe) ";
         };
 
+        # format = ''
+        #   $directory$git_branch$git_state$git_metrics$dart$lua$nodejs$package$python$rust$nix_shell$custom
+        #   $character
+        # '';
+
         format = ''
-          $directory$git_branch$git_state$git_metrics$dart$lua$nodejs$package$python$rust$nix_shell$custom
+          $directory
           $character
         '';
 
@@ -31,29 +38,85 @@
         };
         git_commit = {commit_hash_length = 5;};
 
+        golang = {
+          format = "[ ]($style)";
+          style = "bold blue";
+        };
+
         dart = {
-          symbol = "[](blue) ";
+          symbol = "[]($style) ";
+          style = "bold blue";
         };
+
         lua = {
-          symbol = "[](blue) ";
+          symbol = "[]($style) ";
+          style = "bold blue";
         };
+
         nodejs = {
           version_format = "v$raw(blue)";
         };
+
         package = {
           symbol = "📦";
         };
+
         python = {
-          symbol = "[](blue) ";
+          symbol = "[]($style) ";
+          style = "bold blue";
         };
+
         rust = {
-          symbol = "[](red) ";
+          symbol = "[]($style) ";
+          style = "bold blue";
         };
+
         shell = {
           disabled = true;
           zsh_indicator = "zsh";
         };
 
+        aws = {
+          format = "on [$symbol($profile )(\($region) )]($style)";
+          style = "bold blue";
+          symbol = "  ";
+        };
+
+        kubernetes = {
+          symbol = "☸ ";
+          disabled = false;
+          detect_files = ["Dockerfile"];
+          format = "[$context(\[$namespace\])]($style) ";
+        };
+
+        docker_context = {
+          disabled = true;
+        };
+
+        # nix_shell = {
+        #   disabled = false;
+        #   heuristic = false;
+        #   impure_msg = "[impure-shell](red)";
+        #   pure_msg = "[pure-shell](green)";
+        #   unknown_msg = "[unknown-shell](yellow)";
+        # };
+
+        custom = {
+          nix = {
+            disabled = true;
+            detect_files = ["flake.nix" "default.nix" "shell.nix"];
+            # format = "via [$symbol nix-shell]($style) ";
+            # command = ''
+            #   if [ -e flake.nix ] || [ -e default.nix ] || [ -e shell.nix ]; then
+            #     echo " (nix-shell)"
+            #   fi
+            # '';
+            format = "[$symbol$output]($style)";
+            style = "bold blue";
+            symbol = "[](bold blue) ";
+          };
+        };
+
         username = {
           show_always = false;
           style_user = "bold bg:none fg:#7aa2f7";
@@ -85,30 +148,6 @@
           format = "[ $time 󰥔]($style) ";
           style = "bold #393939";
         };
-
-        nix_shell = {
-          disabled = false;
-          heuristic = false;
-          impure_msg = "[impure-shell](red)";
-          pure_msg = "[pure-shell](green)";
-          unknown_msg = "[unknown-shell](yellow)";
-        };
-
-        custom = {
-          nix = {
-            disabled = false;
-            detect_files = ["flake.nix" "default.nix" "shell.nix"];
-            # format = "via [$symbol nix-shell]($style) ";
-            # command = ''
-            #   if [ -e flake.nix ] || [ -e default.nix ] || [ -e shell.nix ]; then
-            #     echo " (nix-shell)"
-            #   fi
-            # '';
-            format = "[$symbol$output]($style)";
-            style = "bold blue";
-            symbol = "[](bold blue) ";
-          };
-        };
       }
       // builtins.fromTOML (builtins.readFile (pkgs.fetchFromGitHub
         {

home/desktop/desktop/addons/kitty/default.nix → home/redyf/desktop/addons/kitty/default.nix

@@ -7,11 +7,12 @@
     };
     theme = "Catppuccin-Mocha";
     font = {
-      name = "MonoLisa";
+      # name = "MonoLisa";
       # name = "Liga SfMono Nerd Font";
       # name = "Berkeley Mono Regular Nerd Font Complete";
-      size = 12;
-      package = pkgs.monolisa-script;
+      name = "LiterationMono Nerd Font";
+      size = 11;
+      # package = pkgs.monolisa-script;
     };
     # https://www.monolisa.dev/faq#how-to-enable-stylistic-sets-for-the-kitty-terminal
     extraConfig = ''

home/desktop/desktop/hyprland/default.nix → home/redyf/desktop/hyprland/default.nix

@@ -4,7 +4,6 @@
   ...
 }: let
   hyprlandFlake = inputs.hyprland.packages.${pkgs.system}.hyprland;
-  fontsize = "12";
   oxocarbon_pink = "ff7eb6";
   oxocarbon_border = "393939";
   oxocarbon_background = "161616";
@@ -79,6 +78,12 @@ in {
       monitor = [
         ",highrr,auto,auto"
       ];
+      env = [
+        "XCURSOR_SIZE,32"
+        "XCURSOR_THEME,macOS-BigSur"
+        "HYPRCURSOR_THEME,macOS-BigSur"
+        "HYPRCURSOR_SIZE,32"
+      ];
 
       xwayland = {
         force_zero_scaling = true;
@@ -108,7 +113,7 @@ in {
         gaps_out = 2;
         border_size = 3;
         "col.active_border" = "${catppuccin_border}";
-        "col.inactive_border" = "${transparent_gray}";
+        "col.inactive_border" = "${tokyonight_border}";
         layout = "dwindle";
         apply_sens_to_raw = 1; # whether to apply the sensitivity to raw input (e.g. used by games where you aim using your mouse)
       };
@@ -156,7 +161,7 @@ in {
       misc = {
         vfr = true; # misc:no_vfr -> misc:vfr. bool, heavily recommended to leave at default on. Saves on CPU usage.
         vrr = false; # misc:vrr -> Adaptive sync of your monitor. 0 (off), 1 (on), 2 (fullscreen only). Default 0 to avoid white flashes on select hardware.
-        enable_hyprcursor = false;
+        enable_hyprcursor = true;
       };
 
       dwindle = {
@@ -318,7 +323,6 @@ in {
 
     # Submaps
     # extraConfig = [
-    # "gsettings set org.gnome.desktop.interface cursor-theme macOS-BigSur"
     #        source = ~/.config/hypr/themes/catppuccin-macchiato.conf
     #        source = ~/.config/hypr/themes/oxocarbon.conf
     #        env = GBM_BACKEND,nvidia-drm

home/desktop/system/fonts/default.nix → home/redyf/system/fonts/default.nix

@@ -1,20 +1,17 @@
-{
-  inputs,
-  pkgs,
-  ...
-}: {
+{pkgs, ...}: {
   home = {
     packages = with pkgs; [
       dejavu_fonts
       font-awesome
       fira-code-symbols
       material-design-icons
-      (nerdfonts.override {fonts = ["FiraMono" "JetBrainsMono"];})
+      (nerdfonts.override {fonts = ["FiraMono" "JetBrainsMono" "LiberationMono"];})
       noto-fonts
       powerline-symbols
       monolisa-script
-      sf-mono-liga-bin
-      berkeley
+      # sf-mono-liga-bin
+      # berkeley
+      # geist-font
     ];
   };
 }

home/desktop/system/shell/default.nix → home/redyf/system/shell/default.nix

@@ -11,7 +11,6 @@ in {
       sudo = "doas";
       c = "nvim";
       cp = "cp -i";
-      e = "emacsclient -c -a 'emacs'";
       f = "neofetch --sixel";
       p = "pfetch";
       fetch = "neofetch w3m";
@@ -51,17 +50,15 @@ in {
         # Export PATHs for applications
         export PATH=$PATH:~/.local/bin/
         export PATH=/tmp/lazy-lvim/bin:$PATH
-        export PATH="$HOME/.emacs.d/bin:$PATH"
+        export PATH="$PATH:/home/redyf/.emacs.d/bin"
+        export PATH="$PATH:/home/redyf/.config/emacs/bin"
         export PATH="$PATH:/run/current-system/sw/bin/jdtls"
         export PATH="$PATH:/run/current-system/sw/bin/jdt-language-server"
         export PATH="$PATH:/etc/profiles/per-user/redyf/bin/flutter"
         export PATH="$PATH:/home/redyf/Android/Sdk"
         export PATH="$PATH:/home/redyf/Android/Sdk/platform-tools/"
         export PATH="$PATH:/home/redyf/Android/Sdk/cmdline-tools/latest/bin"
-        export PATH="$PATH:/home/redyf/.nix-profile/bin/swww"
-        export PATH="$PATH:/home/redyf/.nix-profile/bin/swww-daemon"
         export PATH="$PATH:$FORGIT_INSTALL_DIR/bin"
-        export PATH="$PATH:/home/redyf/.config/nvim/bin"
         export WINIT_UNIX_BACKEND=x11 neovide
 
         # Autosuggest
@@ -154,7 +151,6 @@ in {
       shellAliases = {
         c = "nvim";
         cp = "cp -i";
-        e = "emacsclient -c -a 'emacs'";
         f = "neofetch --sixel";
         p = "pfetch";
         fetch = "neofetch w3m";

hosts/redyf/configuration.nix

@@ -66,8 +66,6 @@
       __GLX_VENDOR_LIBRARY_NAME = "nvidia";
       __GL_GSYNC_ALLOWED = "1";
       __GL_VRR_ALLOWED = "0"; # Controls if Adaptive Sync should be used. Recommended to set as “0” to avoid having problems on some games.
-      XCURSOR_THEME = "macOS-BigSur";
-      XCURSOR_SIZE = "32";
       QT_AUTO_SCREEN_SCALE_FACTOR = "1";
       QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
       CUDA_CACHE_PATH = "$XDG_CACHE_HOME/nv";
@@ -141,12 +139,15 @@
 
   programs = {
     zsh.enable = true;
-    hyprland = {
-      enable = true;
-    };
     noisetorch = {
       enable = false;
     };
+    # nh = {
+    #   enable = false;
+    #   clean.enable = false;
+    #   clean.extraArgs = "--keep-since 4d --keep 3";
+    #   flake = "/home/redyf/nixdots";
+    # };
   };
 
   # Enables docker in rootless mode
@@ -253,7 +254,7 @@
           extraPackages = hpkgs: [
             hpkgs.xmobar
           ];
-          config = builtins.readFile ../../home/desktop/desktop/xmonad/xmonad.hs;
+          config = builtins.readFile ../../home/redyf/desktop/xmonad/xmonad.hs;
         };
       };
       libinput = {
@@ -293,7 +294,6 @@
 
   environment.systemPackages = with pkgs; [
     git
-    # playerctl
     inputs.xdg-portal-hyprland.packages.${system}.xdg-desktop-portal-hyprland
   ];