install.sh

@@ -4,13 +4,12 @@
 
 nix-shell -p git --command "git clone https://gitlab.com/librephoenix/nixos-config ~/.dotfiles"
 sudo nixos-generate-config --show-hardware-config > ~/.dotfiles/system/hardware-configuration.nix
-sed -i "0,/emmet/s//$(whoami)/" ~/.dotfiles/flake.nix
-sed -i "0,/Emmet/s//$(getent passwd $(whoami) | cut -d ':' -f 5 | cut -d ',' -f 1)/" ~/.dotfiles/flake.nix
-sed -i "s/emmet@librephoenix.com//" ~/.dotfiles/flake.nix
+sed -i "0,/emmet/s//$(whoami)/" flake.nix
+sed -i "0,/Emmet/s//$(getent passwd $(whoami) | cut -d ':' -f 5 | cut -d ',' -f 1)/" flake.nix
 if [ -z "$EDITOR" ]; then
     EDITOR=nano;
 fi
 $EDITOR ~/.dotfiles/flake.nix;
 sudo nixos-rebuild switch --flake ~/.dotfiles#system;
 nix run home-manager/master --extra-experimental-features nix-command --extra-experimental-features flakes -- switch --flake ~/.dotfiles#user;
-sudo ~/.dotfiles/harden.sh ~/.dotfiles;
+sudo ~/.dotfiles/harden.sh;

profiles/work/configuration.nix

@@ -14,7 +14,7 @@
       ../../system/hardware/printing.nix
       ../../system/hardware/bluetooth.nix
       (./. + "../../../system/wm"+("/"+userSettings.wm)+".nix") # My window manager
-      #../../system/app/flatpak.nix
+      ../../system/app/flatpak.nix
       ../../system/app/virtualization.nix
       ( import ../../system/app/docker.nix {storageDriver = "btrfs"; inherit userSettings lib;} )
       ../../system/security/doas.nix

profiles/work/home.nix

@@ -21,7 +21,7 @@
               ../../user/app/keepass/keepass.nix # My password manager
               (./. + "../../../user/app/browser"+("/"+userSettings.browser)+".nix") # My default browser selected from flake
               ../../user/app/virtualization/virtualization.nix # Virtual machines
-              #../../user/app/flatpak/flatpak.nix # Flatpaks
+              ../../user/app/flatpak/flatpak.nix # Flatpaks
               ../../user/style/stylix.nix # Styling and themes for my apps
               ../../user/lang/cc/cc.nix # C and C++ tools
               ../../user/lang/godot/godot.nix # Game development
@@ -97,11 +97,12 @@
     #blockbench-electron
     cura
     obs-studio
-    kdenlive
+    #install kdenlive via flatpak due to missing plugins
+    #kdenlive
     ffmpeg
     (pkgs.writeScriptBin "kdenlive-accel" ''
       #!/bin/sh
-      DRI_PRIME=0 kdenlive "$1"
+      DRI_PRIME=0 flatpak run org.kde.kdenlive "$1"
     '')
     movit
     mediainfo

user/app/games/games.nix

@@ -1,4 +1,4 @@
-{ pkgs, pkgs-stable, ... }:
+{ config, pkgs, pkgs-stable, ... }:
 let
   myRetroarch =
     (pkgs.retroarch.override {
@@ -64,5 +64,11 @@ in
     url = "https://github.com/libretro/libretro-core-info/archive/refs/tags/v1.15.0.tar.gz";
     sha256 = "004kgbsgbk7hn1v01jg3vj4b6dfb2cp3kcp5hgjyl030wqg1r22q";
   };
+  # To get steam to import into gamehub, first install it as a flatpak, then
+  # Set steam directory to ~/.var/app/com.valvesoftware.Steam/.steam
 
+  #services.flatpak.packages = [
+  #  "com.discordapp.Discord"
+  #  "com.jaquadro.NBTExplorer"
+  #];
 }

user/app/ranger/rc.conf

@@ -447,7 +447,7 @@ map }     traverse
 map {     traverse_backwards
 map )     jump_non
 
-map gh chain set sort=basename; set sort_reverse=False; cd ~
+map gh cd ~
 map ga cd ~/Archive
 map gd cd ~/Downloads
 map gm cd ~/Media

user/wm/hyprland/hyprland.nix

@@ -219,9 +219,9 @@
        bind=SUPERSHIFT,P,exec,hyprprofile-dmenu
 
        # 3 monitor setup
-       monitor=eDP-1,1920x1080,1000x1080,1
-       monitor=HDMI-A-1,1920x1080,1920x0,1
-       monitor=DP-1,1920x1080,0x0,1
+       monitor=eDP-1,1920x1080,1000x1200,1
+       monitor=HDMI-A-1,1920x1200,1920x0,1
+       monitor=DP-1,1920x1200,0x0,1
 
        # 2 monitor setup
        #monitor=eDP-1,1920x1080,1920x0,1