Merge pull request #80 from redyf/dev

dev
redyf · Jun 27, 2024 · 7562914 · 7562914
2 parents c56c1b0 + 179db81
commit 7562914
Show file tree

Hide file tree

Showing 14 changed files with 160 additions and 255 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -2,7 +2,6 @@
   description = "Redyf's Flake";
 
   inputs = {
-    # Core
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     home-manager = {
       url = "github:nix-community/home-manager/master";
@@ -17,22 +16,15 @@
     stylix.url = "github:danth/stylix";
     ags.url = "github:Aylur/ags";
     matugen.url = "github:InioX/matugen?ref=v2.2.0";
-    xdg-portal-hyprland.url = "github:hyprwm/xdg-desktop-portal-hyprland";
-
-    # git+ssh://git@git.example.com/User/repo.git
-    # fontflake.url = "git+ssh://git@github.com/redyf/font-flake.git";
-
-    # liga-martian-mono = {
-    #   url = "github:redyf/LigaMartianMono";
-    #   flake = false;
-    # };
+    font-flake.url = "github:redyf/font-flake";
 
     # SFMono w/ patches
     # sf-mono-liga-src = {
     #   url = "github:shaunsingh/SFMono-Nerd-Font-Ligaturized";
     #   flake = false;
     # };
 
+    # git+ssh://git@git.example.com/User/repo.git if you're using private repos
     # berkeley = {
     #   url = "git+ssh://git@github.com/redyf/berkeley.git";
     #   flake = false;
@@ -51,6 +43,7 @@
     home-manager,
     disko,
     stylix,
+    font-flake,
     ...
   } @ inputs: let
     supportedSystems = ["x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin"];

diff --git a/home/redyf/apps/default.nix b/home/redyf/apps/default.nix
@@ -1,11 +1,12 @@
 _: {
   imports = [
-    # ./artix-game-launcher
+    ./artix-game-launcher
     ./discord
     # ./davinci-resolve
     # ./emacs
+    # ./figma
     ./firefox
-    # ./insomnia
+    ./insomnia
     ./misc
     ./obs
     # ./vscode

diff --git a/home/redyf/apps/figma/default.nix b/home/redyf/apps/figma/default.nix
@@ -0,0 +1,5 @@
+{pkgs, ...}: {
+  home.packages = with pkgs; [
+    figma-linux
+  ];
+}
diff --git a/home/redyf/apps/misc/default.nix b/home/redyf/apps/misc/default.nix
@@ -1,5 +1,4 @@
 {pkgs, ...}: {
-  # 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
@@ -15,32 +14,23 @@
     obsidian
 
     # Other stuff
-    gh
     ollama
     playerctl
     # spotify
     # brave
 
     # Rice
-    bemenu
     # cmatrix
-    nitrogen # Wallpaper utility for X11
-    nwg-look # Change GTK theme
 
-    # Screenshot + extra utils
-    grim # Screenshot tool for hyprland
-    slurp # Works with grim to screenshot on wayland
-    wl-clipboard # Enables copy/paste on wayland
+    # Extra utils
     vlc
-
-    # System Utils
     mpv
     glib
     unzip # Unzip files using the terminal
     ffmpeg_6 # A complete, cross-platform solution to record, convert and stream audio and video
     tree-sitter # A parser generator tool and an incremental parsing library
     appimage-run # Run appimage files in the terminal
     polkit_gnome
-    cinnamon.nemo
+    pcmanfm
   ];
 }
diff --git a/home/redyf/cli-apps/neovim/default.nix b/home/redyf/cli-apps/neovim/default.nix
@@ -2,7 +2,6 @@
   home = {
     packages = with pkgs; [
       neovim
-      lazygit
       stylua
       sumneko-lua-language-server
       ripgrep

diff --git a/home/redyf/cli-apps/neve/default.nix b/home/redyf/cli-apps/neve/default.nix
@@ -5,7 +5,6 @@
 }: {
   home.packages = with pkgs; [
     inputs.Neve.packages.${system}.default
-    lazygit
     stylua
     sumneko-lua-language-server
     ripgrep

diff --git a/home/redyf/desktop/awesomewm.nix b/home/redyf/desktop/awesomewm.nix
@@ -11,6 +11,7 @@
       dunst
       dmenu
       flameshot
+      nitrogen # Wallpaper utility for X11
     ];
   };
   services = {

diff --git a/home/redyf/desktop/hyprland/default.nix b/home/redyf/desktop/hyprland/default.nix
@@ -17,9 +17,12 @@
   gnomeSchema = "org.gnome.desktop.interface";
 in {
   home.packages = with pkgs; [
-    grim
-    slurp
-    swappy
+    grim # Screenshot tool for hyprland
+    slurp # Works with grim to screenshot on wayland
+    swappy # Wayland native snapshot editing tool, inspired by Snappy on macOS
+    wl-clipboard # Enables copy/paste on wayland
+    bemenu
+    nwg-look # Change GTK theme
 
     (writeShellScriptBin "screenshot" ''
       grim -g "$(slurp)" - | wl-copy
@@ -44,10 +47,6 @@ in {
       swww kill
       swww init
 
-      # Mako (Notifications)
-      pkill mako
-      mako &
-
       # Cursor
       gsettings set org.gnome.desktop.interface cursor-theme macOS-BigSur
       hyprctl setcursor macOS-BigSur 32 # "Catppuccin-Mocha-Mauve-Cursors"
@@ -187,7 +186,7 @@ in {
         mfact = 0.5;
         orientation = "right";
         special_scale_factor = 0.8;
-        new_is_master = true;
+        new_status = "master";
         no_gaps_when_only = false;
       };
 

diff --git a/home/redyf/home.nix b/home/redyf/home.nix
@@ -30,44 +30,6 @@
     config = {
       allowUnfree = true;
     };
-    overlays = with inputs; [
-      (
-        final: prev: {
-          sf-mono-liga-bin = prev.stdenvNoCC.mkDerivation {
-            pname = "sf-mono-liga-bin";
-            version = "dev";
-            src = sf-mono-liga-src;
-            dontConfigure = true;
-            installPhase = ''
-              mkdir -p $out/share/fonts/opentype
-              cp -R $src/*.otf $out/share/fonts/opentype/
-            '';
-          };
-
-          monolisa-script = prev.stdenvNoCC.mkDerivation {
-            pname = "monolisa";
-            version = "dev";
-            src = monolisa-script;
-            dontConfigure = true;
-            installPhase = ''
-              mkdir -p $out/share/fonts/opentype
-              cp -R $src/*.ttf $out/share/fonts/opentype/
-            '';
-          };
-
-          berkeley = prev.stdenvNoCC.mkDerivation {
-            pname = "berkeley-mono";
-            version = "dev";
-            src = berkeley;
-            dontConfigure = true;
-            installPhase = ''
-              mkdir -p $out/share/fonts/opentype
-              cp -R $src/*.otf $out/share/fonts/opentype/
-            '';
-          };
-        }
-      )
-    ];
   };
 
   # Add support for .local/bin

diff --git a/home/redyf/system/nix/default.nix b/home/redyf/system/nix/default.nix
@@ -3,8 +3,6 @@
     nil
     statix
     alejandra
-    nurl
     nix-init
-    nix-prefetch-git
   ];
 }
diff --git a/home/redyf/tools/git/default.nix b/home/redyf/tools/git/default.nix
@@ -1,4 +1,4 @@
-_: {
+{pkgs, ...}: {
   programs.git = {
     enable = true;
     userName = "Redyf";
@@ -9,4 +9,8 @@ _: {
       pull.rebase = false;
     };
   };
+  home.packages = with pkgs; [
+    gh
+    lazygit
+  ];
 }
diff --git a/home/redyf/tools/http/default.nix b/home/redyf/tools/http/default.nix
@@ -1,3 +1,3 @@
 {pkgs, ...}: {
-  home.packages = with pkgs; [curl httpie openssl];
+  home.packages = with pkgs; [curl openssl];
 }
diff --git a/hosts/redyf/configuration.nix b/hosts/redyf/configuration.nix
@@ -77,7 +77,7 @@ in {
     sessionVariables = {
       NIXOS_OZONE_WL = "1"; # Hint electron apps to use wayland
       WLR_NO_HARDWARE_CURSORS = "1"; # Fix cursor rendering issue on wlr nvidia.
-      DEFAULT_BROWSER = "${pkgs.brave}/bin/brave"; # Set default browser
+      DEFAULT_BROWSER = "${pkgs.firefox}/bin/firefox"; # Set default browser
     };
     shellAliases = {nvidia-settings = "nvidia-settings --config='$XDG_CONFIG_HOME'/nvidia/settings";};
   };
@@ -133,6 +133,7 @@ in {
     hyprland = {
       enable = true;
       package = inputs.hyprland.packages.${pkgs.system}.hyprland;
+      portalPackage = with pkgs; xdg-desktop-portal-hyprland;
     };
     noisetorch.enable = true;
     nh = {
@@ -157,8 +158,8 @@ in {
     base16Scheme = "${pkgs.base16-schemes}/share/themes/${theme}.yaml";
     fonts = {
       monospace = {
-        package = with pkgs; nerdfonts.override {fonts = ["MartianMono"];};
-        name = "MartianMono Nerd Font";
+        package = with pkgs; nerdfonts.override {fonts = ["IBMPlexMono"];};
+        name = "BlexMono Nerd Font Bold";
       };
       sansSerif = {
         package = pkgs.dejavu_fonts;