Removed auto-launch gui applications from river init, removed lf configuration, and added nixos-shell package.

flake.lock

@@ -36,28 +36,10 @@
         "type": "github"
       }
     },
-    "river-bsp-layout": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1,
-        "narHash": "sha256-9l80YSyV6CEKAJVnJ3LoUc88O/M0b9wKbj0mMGmL6gI=",
-        "path": "./packages/river-bsp-layout",
-        "type": "path"
-      },
-      "original": {
-        "path": "./packages/river-bsp-layout",
-        "type": "path"
-      }
-    },
     "root": {
       "inputs": {
         "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs",
-        "river-bsp-layout": "river-bsp-layout"
+        "nixpkgs": "nixpkgs"
       }
     }
   },

flake.nix

@@ -18,10 +18,6 @@
         long = "iiogama";
         email = "iiogama@0x212.org";
       };
-      pkgs = import nixpkgs {
-        inherit system;
-        config.allowUnfree = true;
-      };
       lib = nixpkgs.lib;
     in {
       nixosConfigurations = (

home-manager/base.nix

@@ -1,4 +1,4 @@
-# All home.nix
+# Base home.nix
 { config, lib, pkgs, inputs, user, ... }:
 {
   programs.home-manager.enable = true;
@@ -66,68 +66,6 @@
       endif
     '';
   };
-  xdg.configFile."lf/icons".source = ./dots/icons;
-  programs.lf = {
-    enable = true;
-    commands = {
-      dragon-out = ''%${pkgs.xdragon}/bin/xdragon -a -x "$fx"'';
-      editor-open = ''$$EDITOR $f'';
-      mkdir = ''
-        ''${{
-          printf "Directory Name: "
-          read DIR
-          mkdir $DIR
-        }}
-      '';
-    };
-    keybindings = {
-      "\\\"" = "";
-      o = "";
-      c = "mkdir";
-      "." = "set hidden!";
-      "`" = "mark-load";
-      "\\'" = "mark-load";
-      "<enter>" = "open";
-      do = "dragon-out";
-      "g~" = "cd";
-      gh = "cd";
-      "g/" = "/";
-      ee = "editor-open";
-      V = ''''$${pkgs.bat}/bin/bat --paging=always "$f"'';
-    };
-    settings = {
-      preview = true;
-      hidden = true;
-      drawbox = true;
-      icons = true;
-      ignorecase = true;
-    };
-    extraConfig =
-    let
-      previewer = 
-        pkgs.writeShellScriptBin "pv.sh" ''
-        file=$1
-        w=$2
-        h=$3
-        x=$4
-        y=$5
-
-        if [[ "$( ${pkgs.file}/bin/file -Lb --mime-type "$file")" =~ ^image ]]; then
-          ${pkgs.kitty}/bin/kitty +kitten icat --silent --stdin no --transfer-mode file --place "''${w}x''${h}@''${x}x''${y}" "$file" < /dev/null > /dev/tty
-          exit 1
-        fi
-
-        ${pkgs.pistol}/bin/pistol "$file"
-      '';
-      cleaner = pkgs.writeShellScriptBin "clean.sh" ''
-        ${pkgs.kitty}/bin/kitty +kitten icat --clear --stdin no --silent --transfer-mode file </dev/null > /dev/tty
-      '';
-    in
-    ''
-      set cleaner ${cleaner}/bin/clean.sh
-      set previewer ${previewer}/bin/pv.sh
-    '';
-  };
   programs.password-store = {
     enable = true;
     package = pkgs.pass.withExtensions (exts: [ exts.pass-otp exts.pass-import ]);

home-manager/chat.nix

@@ -1,16 +0,0 @@
-# Chat home.nix
-{ config, lib, pkgs, inputs, user, ... }:
-{
-  xdg.configFile = {
-    "catgirl" = {
-      source = ./dots/catgirl;
-      target = "catgirl";
-      recursive = true;
-    };
-    "senpai" = {
-      source = ./dots/senpai;
-      target = "senpai";
-      recursive = true;
-    };
-  };
-}

home-manager/cli.nix

@@ -1,6 +1,9 @@
 # CLI home.nix
 { config, lib, pkgs, inputs, user, ... }:
 {
+  imports = [
+    ./base.nix
+  ];
   home.shellAliases = {
     wget = "wget --hsts-file=${config.xdg.configHome}/wget-hsts";
     doas = "sudo";
@@ -12,11 +15,21 @@
     "${config.home.homeDirectory}/.local/share/go/bin"
   ];
   xdg.configFile = {
+    "catgirl" = {
+      source = ./dots/catgirl;
+      target = "catgirl";
+      recursive = true;
+    };
     "cava" = {
       source = ./dots/cava;
       target = "cava";
       recursive = true;
     };
+    "senpai" = {
+      source = ./dots/senpai;
+      target = "senpai";
+      recursive = true;
+    };
   };
   xdg = {
     userDirs = {

home-manager/dots/bashrc

@@ -9,6 +9,11 @@ set -o vi
 unset HISTFILE
 
 # Functions
+function home() {
+	cd
+	clear
+}
+
 function search() {
 	surfraw $(surfraw -elvi | fzf | awk '{print $1;}')
 }

home-manager/dots/river/init

@@ -3,19 +3,13 @@
 # documentation.
 
 # Autostart
-riverctl spawn "way-displays > /tmp/way-displays.${XDG_VTNR}.${USER}.log 2>&1"
+riverctl spawn "way-displays -c $HOME/.config/way-displays/cfg.yaml"
 riverctl spawn "swww init"
 riverctl spawn "swww img $HOME/Pictures/wallpapers/bliss-night.png --transition-type simple"
 riverctl spawn "wl-paste --type text --watch cliphist store"
 riverctl spawn "wl-paste --type image --watch cliphist store"
 riverctl spawn "mako"
 riverctl spawn "mullvad-gui"
-riverctl spawn "mullvad-browser"
-riverctl spawn "librewolf"
-riverctl spawn "thunderbird"
-riverctl spawn "steam"
-riverctl spawn "discord"
-riverctl spawn "signal-desktop"
 
 # Theme
 riverctl background-color 0x282a36
@@ -23,9 +17,9 @@ riverctl border-color-focused 0xbd93f9
 riverctl border-color-unfocused 0x282a36
 
 # Launch Shortcuts
-riverctl map normal Super Return spawn "foot iitmux"
+riverctl map normal Super Return spawn "foot tmux.sh"
 riverctl map normal Super+Shift Return spawn "foot"
-riverctl map normal Super Space spawn "iiwmenu"
+riverctl map normal Super Space spawn "wmenu.sh"
 
 # Focus Controls
 riverctl map normal Super H focus-view previous

home-manager/dots/sxhkd/sxhkdrc

@@ -8,11 +8,11 @@ super + Return
 
 # terminal emulator with tmux session menu
 super + shift + Return
-	st -e "iitmux"
+	st -e "tmux.sh"
 
 # program launcher
 super + @space
-	iixmenu
+	xmenu.sh
 
 # screenshot shortcut
 super + shift + s

home-manager/gui.nix

@@ -1,6 +1,9 @@
 # GUI home.nix
 { config, lib, pkgs, inputs, user, ... }:
 {
+  imports = [
+    ./cli.nix
+  ];
   xdg = {
     systemDirs.data = [
       "/var/lib/flatpak/exports/share"

hosts/buckwheat/configuration.nix

@@ -28,6 +28,7 @@ in
   };
   environment = {
     systemPackages = with pkgs; [
+      nixos-shell
       virtiofsd
     ];
   };

hosts/default.nix

@@ -5,9 +5,6 @@
     inherit system;
     specialArgs = { inherit user inputs; };
     modules = [ 
-      ../nixos/all.nix
-      ../nixos/cli.nix
-      ../nixos/chat.nix
       ../nixos/wayland.nix
       ../nixos/gaming.nix
       ../nixos/office.nix
@@ -18,9 +15,6 @@
         home-manager.extraSpecialArgs = { inherit user; };
         home-manager.users.${user.name} = {
           imports = [
-            ../home-manager/all.nix
-            ../home-manager/cli.nix
-            ../home-manager/chat.nix
             ../home-manager/wayland.nix
             ./buckwheat/home.nix
           ];
@@ -32,8 +26,6 @@
     inherit system;
     specialArgs = { inherit user inputs; };
     modules = [ 
-      ../nixos/all.nix
-      ../nixos/cli.nix
       ../nixos/xorg.nix
       ../nixos/office.nix
       ../nixos/pentest.nix
@@ -44,8 +36,6 @@
         home-manager.extraSpecialArgs = { inherit user; };
         home-manager.users.${user.name} = {
           imports = [
-            ../home-manager/all.nix
-            ../home-manager/cli.nix
             ../home-manager/xorg.nix
             ./fireweed/home.nix
           ];
@@ -57,7 +47,6 @@
     inherit system;
     specialArgs = { inherit user inputs; };
     modules = [ 
-      ../nixos/all.nix
       ../nixos/cli.nix
       ./vm/configuration.nix
       home-manager.nixosModules.home-manager {
@@ -66,7 +55,6 @@
         home-manager.extraSpecialArgs = { inherit user; };
         home-manager.users.${user.name} = {
           imports = [
-            ../home-manager/all.nix
             ../home-manager/cli.nix
             ./vm/home.nix
           ];

nixos/base.nix

@@ -1,4 +1,4 @@
-# All configuration.nix
+# Base configuration.nix
 { config, lib, pkgs, inputs, user, ... }:
 {
   nix = {

nixos/chat.nix

@@ -1,13 +0,0 @@
-# Office packages configuration.nix
-{ config, lib, pkgs, inputs, user, ... }:
-{
-  users.users.${user.name}.packages = with pkgs; [
-    catgirl
-    discord
-    profanity
-    sic
-    senpai
-    signal-desktop
-    tut
-  ];
-}

nixos/cli.nix

@@ -1,6 +1,9 @@
 # CLI configuration.nix
 { config, lib, pkgs, inputs, user, ... }:
 {
+  imports = [
+    ./base.nix
+  ];
   environment = {
     localBinInPath = true;
     variables = {
@@ -69,7 +72,9 @@
     wireplumber.enable = true;
   };
   users.users.${user.name}.packages = with pkgs; [
+    bashmount
     btfs
+    catgirl
     cava
     cifs-utils
     cmus
@@ -109,12 +114,16 @@
     oed
     pdfgrep
     phetch
+    profanity
     recutils
+    senpai
     shellcheck
+    sic
     sipcalc
     ssss
     surfraw
     tmux-xpanes
+    tut
     unrar
     unzip
     up

nixos/gui.nix

@@ -1,6 +1,9 @@
 # GUI configuration.nix
 { config, lib, pkgs, inputs, user, ... }:
 {
+  imports = [
+    ./cli.nix
+  ];
   environment = {
     variables = {
       VISUAL = "$EDITOR";
@@ -41,7 +44,6 @@
   };
   users.users.${user.name}.packages = with pkgs; [
     ani-cli
-    bashmount
     glib
     lagrange
     librewolf
@@ -50,6 +52,7 @@
     mullvad-browser
     mupdf
     #onionshare-gui
+    signal-desktop
     tor-browser-bundle-bin
     #urlview
     ytfzf

nixos/wayland.nix

@@ -27,10 +27,17 @@
       enable = true;
       extraPackages = with pkgs; [
         bemenu
+        bemoji
+        cliphist
         foot
+        grimblast
+        imv
         mako
         swaylock
+        swww
+        tessen
         way-displays
+        wl-clipboard
         wtype
       ];
     };
@@ -38,15 +45,4 @@
       enable = true;
     };
   };
-  users.users.${user.name}.packages = with pkgs; [
-    bemoji
-    cliphist
-    grimblast
-    imv
-    swww
-    tessen
-    wl-clipboard
-  ];
-  environment.systemPackages = [
-  ];
 }