Merge branch 'master' of https://git.ahubbard.xyz/alex/dotfiles

.config/user-dirs.dirs

@@ -8,8 +8,8 @@
 XDG_DESKTOP_DIR="$HOME/.local/share/desktop"
 XDG_DOWNLOAD_DIR="$HOME/dl"
 XDG_DOCUMENTS_DIR="$HOME/docs"
-XDG_MUSIC_DIR="$HOME/"
+XDG_MUSIC_DIR="$HOME/media/audio"
 XDG_PICTURES_DIR="$HOME/media/img"
-XDG_VIDEOS_DIR="$HOME/"
-XDG_TEMPLATES_DIR="$HOME/"
-XDG_PUBLICSHARE_DIR="$HOME/"
+XDG_VIDEOS_DIR="$HOME/media/video"
+XDG_TEMPLATES_DIR="$HOME/.local/share/templates"
+XDG_PUBLICSHARE_DIR="$HOME/.local/share/public"

.local/installers/arch/arch-install.sh

@@ -47,11 +47,13 @@ init_setup() {
     sudo systemctl enable connman.service
     sudo systemctl enable ufw.service
     sudo systemctl enable cronie.service
+    sudo systemctl enable systemd-timesyncd.service
 }
 
 #TODO
 wireless() {
     sudo pacman -S tlp iwd bluez bluez-utils
+    sudo pacman -S tp_smapi smartmontools ethtool  #opts for tlp
 
     sudo systemctl enable tlp.service
     sudo systemctl enable bluetooth.service
@@ -71,6 +73,11 @@ configure() {
     mkdir -p ~/.config/mpd/playlists
     mkdir -p ~/.local/share/desktop
 
+    mkdir .local/share/public
+    mkdir .local/share/templates
+     mkdir media/audio
+     mkdir media/video
+
     #setup ufw
     sudo ufw default deny incoming
     sudo ufw default allow outgoing

.local/installers/arch/pkgs/aur.list

@@ -16,3 +16,4 @@ waylogout-git
 ani-cli-git
 rofi-lbonn-wayland-git
 pipe-viewer-git
+connman-gtk

.local/installers/arch/pkgs/base.list

@@ -77,3 +77,4 @@ gammastep
 openssh
 aria2
 libva-mesa-driver
+bc

.local/installers/nixos/configuration.nix

@@ -3,7 +3,9 @@
 {
   imports =
     [ # Include the results of the hardware scan.
-      /etc/nixos/hardware-configuration.nix
+      ./hardware-configuration.nix
+      ./gaming-configuration.nix
+      ./sway-configuration.nix
     ];
 
   # This value determines the NixOS release from which the default
@@ -29,12 +31,30 @@
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
 
-  #enable flatpak
-  services.flatpak.enable = true;
-
   networking.hostName = "gabriel"; # Define your hostname.
   # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
-  networking.networkmanager.enable = true;  # Easiest to use and most distros use this by default.
+  #networking.networkmanager.enable = true;  # Easiest to use and most distros use this by default.
+
+  services.connman.enable = true; 
+  networking.wireless.iwd.enable = true;
+  services.connman.wifi.backend = "iwd";
+
+  # Open ports in the firewall.
+  networking.firewall.allowedTCPPorts = [ 67 68 53 ];
+  networking.firewall.allowedTCPPortRanges = [
+  { from = 56881; to = 56889; }
+  { from = 27036; to = 27037; }
+  ];
+
+  # networking.firewall.allowedUDPPorts = [ ... ];
+  networking.firewall.allowedUDPPortRanges = [
+  { from = 27000; to = 27036; }
+  ];
+
+  # Or disable the firewall altogether.
+  # networking.firewall.enable = false;
+
+
 
   # Set your time zone.
   time.timeZone = "America/Chicago";
@@ -59,10 +79,9 @@
      packages = with pkgs; [
 	librewolf
     	yt-dlp
-    	librewolf
     	zathura
-	lutris
 	sfeed
+    	chromium
      ];
    };
 
@@ -77,41 +96,10 @@
      enableSSHSupport = true;
    };
 
-  # Open ports in the firewall.
-  networking.firewall.allowedTCPPorts = [ 67 68 53 ];
-  networking.firewall.allowedTCPPortRanges = [
-  { from = 56881; to = 56889; }
-  { from = 27036; to = 27037; }
-];
-
-  # networking.firewall.allowedUDPPorts = [ ... ];
-  networking.firewall.allowedUDPPortRanges = [
-  { from = 27000; to = 27036; }
-];
-
-  # Or disable the firewall altogether.
-  # networking.firewall.enable = false;
-
   environment.systemPackages = with pkgs; [
-    alacritty # gpu accelerated terminal
-    sway
-    #dbus-sway-environment
-    #configure-gtk
-    wayland
     glib # gsettings
     dracula-theme # gtk theme
     gnome3.adwaita-icon-theme  # default gnome cursors
-    swaylock
-    swayidle
-    grim # screenshot functionality
-    slurp # screenshot functionality
-    wl-clipboard # wl-copy and wl-paste for copy/paste from stdin / stdout
-    bemenu # wayland clone of dmenu
-    mako # notification system developed by swaywm maintainer
-    swaybg
-    waybar
-    xwayland
-    gammastep
     zsh
     noto-fonts
     noto-fonts-extra
@@ -128,20 +116,15 @@
     file
     viu
     bat
-    imv
     pavucontrol
     neovim
-    git
-    shellcheck
     pfetch
     htop-vim
-    radeontop
     lf
     mpv
     mpd
     ncmpcpp
     libnotify
-    jq
     lynx
     mutt-wizard
     pass
@@ -149,19 +132,15 @@
     notmuch
     isync
     pinentry-curses
-    anbox
-    protonup
+    connman-gtk
+    openssl
+    git
+    shellcheck
+    jq
       ];
 
-  #add 32bit support for graphics
-  hardware.opengl.driSupport32Bit = true;
-
-   programs.steam = {
-    enable = false;
-    remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
-    dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
-  };
-
+  #enable flatpak
+  services.flatpak.enable = true;
 
   security.rtkit.enable = true;
   services.pipewire = {
@@ -188,10 +167,4 @@
     gtkUsePortal = true;
   };
 
-  # enable sway window manager
-  programs.sway = {
-    enable = true;
-    wrapperFeatures.gtk = true;
-  };
-
 }

.local/installers/nixos/gaming-configuration.nix

@@ -0,0 +1,17 @@
+{ config, pkgs, lib, ... }: {
+
+  environment.systemPackages = with pkgs; [
+      lutris
+      radeontop
+  ];
+
+  #add 32bit support for graphics
+  hardware.opengl.driSupport32Bit = true;
+
+   programs.steam = {
+    enable = false;
+    remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
+    dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
+  };
+
+}

.local/installers/nixos/sway-configuration.nix

@@ -0,0 +1,27 @@
+{ config, pkgs, lib, ... }: {
+
+  environment.systemPackages = with pkgs; [
+  	wayland
+  	sway
+	alacritty
+	swaylock
+	swayidle
+	grim
+	slurp
+	wl-clipboard
+	mako
+	swaybg
+	waybar
+	xwayland
+	gammastep
+	rofi-wayland
+	imv
+  ];
+
+  # enable sway window manager
+  programs.sway = {
+    enable = true;
+    wrapperFeatures.gtk = true;
+  };
+
+}

.local/scripts/fixscr.sh

@@ -33,7 +33,7 @@ monitor_only() {
     MON="$1"
     RES="$2"
     
-    echo "$MON $RES" >> fixscrsh.log
+    echo "$MON $RES" >> ~/.cache/log/fixscrsh.log
 
     [ -z "$1" ] && MON="$(get_mon)"
     [ -z "$2" ] && RES="$(get_res "$MON")" 
@@ -51,7 +51,11 @@ span() {
 }
 
 menu() {
-OPTS="laptop_only\nmonitor_only\nmirror\nspan\nquit"
+OPTS="laptop_only
+monitor_only
+mirror
+span
+quit"
 
     SEL="$(echo "$OPTS" | bemenu)"
 

.profile

@@ -73,9 +73,9 @@ export AWT_TOOLKIT=MToolkit
 
 #mount samba share, needs entry in /etc/fstab for this line to work
 # //192.168.1.218/storage /media/nagato cifs username=alex,pass=PASSWORD,workgroup=WORKGROUP,user,noauto 0 0
-mount /media/nagato/ &
+#mount /media/nagato/ &
 
 
 if [ "$(tty)" = /dev/tty1 ]; then
-    [ -f /bin/sway ] && exec dbus-launch sway
+    exec dbus-launch sway
 fi