Merge branch 'master' of github.com:starr-dusT/dotfiles

2024-10-06 04:16:16 -07:00 · 2023-11-24 01:11:10 -08:00 · 2023-11-24 01:11:10 -08:00 · 73ee1c841d
commit 73ee1c841d
parent 8a2f08d2e5 bff81e432f
27 changed files with 84 additions and 134 deletions
--- a/home/.chezmoiscripts/.placeholder
+++ b/home/.chezmoiscripts/.placeholder
--- a/home/.chezmoiscripts/run_add-non-steam.sh
+++ b/home/.chezmoiscripts/run_add-non-steam.sh
@ -1,32 +0,0 @@
-#!/usr/bin/env bash
-# Add non-steam games to steam
-
-steam_userid="47011563"
-shortcuts_vdf="$HOME/.steam/root/userdata/${steam_userid}/config/shortcuts.vdf"
-rm $shortcuts_vdf
-
-mkdir -p "$HOME/.local/share/Steam/userdata/47011563/config/grid"
-
-apps=(
-    "/run/current-system/sw/bin/dolphin-emu Dolphin Emulator"
-    "/run/current-system/sw/bin/yuzu Yuzu Emulator"
-    "/run/current-system/sw/bin/ppsspp PPSSPP Emulator"
-    "/run/current-system/sw/bin/mgba-qt mGBA Emulator"
-)
-
-if command -v steamtinkerlaunch &> /dev/null
-then
-    for app in "${apps[@]}"
-    do
-        set -- $app
-        steamtinkerlaunch addnonsteamgame \
-            -ep="$1" -an="$2" \
-            --iconpath="$HOME/.local/share/chezmoi/img/$2/icons.ico" \
-            --hero="$HOME/.local/share/chezmoi/img/$2/hero.png" \
-            --logo="$HOME/.local/share/chezmoi/img/$2/logo.png" \
-            --boxart="$HOME/.local/share/chezmoi/img/$2/boxart.png" \
-            --tenfoot="$HOME/.local/share/chezmoi/img/$2/tenfoot.png" \
-            --tags="$3" \
-            --copy
-    done
-fi
--- a/home/bin/executable_linux-app-launcher
+++ b/home/bin/executable_linux-app-launcher
@ -11,7 +11,7 @@ launchapp=$(IFS=':'; \
    --height="50%" \
    --preview-window="down:wrap:3")
  if [[ "${launchapp}" ]]; then
-    setsid -f "${launchapp}" >/dev/null &
+    setsid -f "${launchapp}" &> /dev/null &
    sleep .1
  fi
 }
--- a/home/dot_config/sway/config.tmpl
+++ b/home/dot_config/sway/config.tmpl
@ -7,8 +7,8 @@

 set $HOME /home/{{ .user }}

-set $DISP_SEC DP-2
-set $DISP_PRI HDMI-A-1
+set $DISP_PRI DP-2
+set $DISP_SEC HDMI-A-1

 set $BOR_WIDTH 3
 set $GAP_INNER 3
@ -91,8 +91,13 @@ gaps left               0

 for_window [title="Steam - News"]   floating enable
 for_window [title="Friends List"]   floating enable
-for_window [title=".*mpv$"] sticky toggle
-for_window [title=".*mpv$"] floating enable
+for_window [title=".*mpv$"] {
+  floating enable
+  sticky toggle
+  resize set width 22ppt
+  resize set height 22ppt
+  move position 77ppt 77ppt
+}
 # Float w3m image previews from newsboat
 for_window [title="ImageMagick"] floating enable

@ -103,7 +108,12 @@ for_window [title="ImageMagick"] floating enable
 for_window [class="steam"] move container to workspace $tag1
 for_window [class="discord"] move container to workspace $tag8
 for_window [class="obsidian"] move container to workspace $tag4
-for_window [title="launcher"] floating enable
+for_window [title="launcher"] {
+  floating enable
+  resize set width 40ppt
+  resize set height 40ppt
+  move position 30ppt 30ppt
+}

 #-------------------------------------------------------------------------------
 #----- KEY BINDINGS
--- a/home/dot_exports
+++ b/home/dot_exports
@ -4,6 +4,9 @@
 # Make vim the default editor.
 export EDITOR=nvim

+# Make kitty behave nice
+export TERM="xterm-256color"
+
 # Customize prompt
 export PROMPT="%{$fg[red]%}%m $PROMPT"

--- a/home/dot_local/share/Steam/userdata/47011563/config/shortcuts.vdf
+++ b/home/dot_local/share/Steam/userdata/47011563/config/shortcuts.vdf
--- a/home/private_dot_newsboat/private_config.tmpl
+++ b/home/private_dot_newsboat/private_config.tmpl
@ -39,3 +39,4 @@ freshrss-login "tstarr"
 freshrss-password "{{ (secret "/run/secrets/homelab/tstarr") }}"
 freshrss-url "https://rss.tstarr.us/api/greader.php"
 urls-source "freshrss"
+freshrss-flag-star "s"
--- a/home/private_dot_newsboat/private_urls
+++ b/home/private_dot_newsboat/private_urls
@ -0,0 +1,2 @@
+"query:Youtube:tags # \"Youtube\"" Meta
+"query:Unread:unread = \"yes\"" Meta
--- a/provision/flake.lock
+++ b/provision/flake.lock
@ -7,16 +7,15 @@
        ]
      },
      "locked": {
-        "lastModified": 1700392168,
-        "narHash": "sha256-v5LprEFx3u4+1vmds9K0/i7sHjT0IYGs7u9v54iz/OA=",
+        "lastModified": 1700695018,
+        "narHash": "sha256-MAiPLgBF4GLzSOlhnPCDWkWW5CDx4i7ApIYaR+TwTVg=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "28535c3a34d79071f2ccb68671971ce0c0984d7e",
+        "rev": "134deb46abd5d0889d913b8509413f6f38b0811e",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
-        "ref": "release-23.05",
        "repo": "home-manager",
        "type": "github"
      }
@ -24,31 +23,32 @@
    "jovian-nixos": {
      "flake": false,
      "locked": {
-        "lastModified": 1698485410,
-        "narHash": "sha256-+O5Acu2n4XQnT4M25W/oH5MLqXy4pFBFhBzKBFOF7Ik=",
-        "rev": "fd7753956149d4e8b19a810eed445d1a52aecd30",
-        "revCount": 459,
+        "lastModified": 1700377627,
+        "narHash": "sha256-MrYHE/oWqVVwyV9n2MbtAHWplCkLvCcvLj3TOkyHD5k=",
+        "ref": "development",
+        "rev": "1ccd4c94521ef7e6678f9d918dbee703d116dd76",
+        "revCount": 514,
        "type": "git",
        "url": "https://github.com/Jovian-Experiments/Jovian-NixOS"
      },
      "original": {
-        "rev": "fd7753956149d4e8b19a810eed445d1a52aecd30",
+        "ref": "development",
        "type": "git",
        "url": "https://github.com/Jovian-Experiments/Jovian-NixOS"
      }
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1700272409,
-        "narHash": "sha256-Mge6iOvomplBsvQ47sIeVAwAUGSVXH4qCW4pLUt/qMI=",
+        "lastModified": 1700390070,
+        "narHash": "sha256-de9KYi8rSJpqvBfNwscWdalIJXPo8NjdIZcEJum1mH0=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "8e5e424b1c059e9ccf5db6a652458e30de05fa3a",
+        "rev": "e4ad989506ec7d71f7302cc3067abd82730a4beb",
        "type": "github"
      },
      "original": {
        "owner": "nixos",
-        "ref": "nixos-23.05",
+        "ref": "nixos-unstable",
        "repo": "nixpkgs",
        "type": "github"
      }
@ -69,22 +69,6 @@
        "type": "github"
      }
    },
-    "nixpkgs-unstable": {
-      "locked": {
-        "lastModified": 1700204040,
-        "narHash": "sha256-xSVcS5HBYnD3LTer7Y2K8ZQCDCXMa3QUD1MzRjHzuhI=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "c757e9bd77b16ca2e03c89bf8bc9ecb28e0c06ad",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
    "nixpkgs_2": {
      "locked": {
        "lastModified": 1700108881,
@ -106,7 +90,6 @@
        "home-manager": "home-manager",
        "jovian-nixos": "jovian-nixos",
        "nixpkgs": "nixpkgs",
-        "nixpkgs-unstable": "nixpkgs-unstable",
        "sops-nix": "sops-nix"
      }
    },
--- a/provision/flake.nix
+++ b/provision/flake.nix
@ -2,37 +2,32 @@
  description = "Flake for nixos configurations";

  inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05";
-    nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
    home-manager = {
-      url = github:nix-community/home-manager/release-23.05;
+      url = github:nix-community/home-manager;
      inputs.nixpkgs.follows = "nixpkgs";
    };
    jovian-nixos = {
-      url = "git+https://github.com/Jovian-Experiments/Jovian-NixOS?rev=fd7753956149d4e8b19a810eed445d1a52aecd30";
+      url = "git+https://github.com/Jovian-Experiments/Jovian-NixOS?ref=development";
      flake = false;
    };
    sops-nix.url = "github:Mic92/sops-nix";
  };

-  outputs = inputs @ { self, nixpkgs, nixpkgs-unstable, home-manager, jovian-nixos, sops-nix, ... }:
+  outputs = inputs @ { self, nixpkgs, home-manager, jovian-nixos, sops-nix, ... }:
    let
      system = "x86_64-linux";
      pkgs = import nixpkgs {
        inherit system;
        config.allowUnfree = true;
      };
-      pkgs-unstable = import nixpkgs-unstable {
-        inherit system;
-        config.allowUnfree = true;
-      };
      lib = nixpkgs.lib;
      user = "tstarr";
    in {
      nixosConfigurations = {
        kestrel = lib.nixosSystem {
          inherit system;
-          specialArgs = { inherit user; inherit pkgs-unstable; };
+          specialArgs = { inherit user; };
          modules = [
            ./modules
            ./hosts/kestrel/configuration.nix
@ -54,7 +49,7 @@

        torus = lib.nixosSystem {
          inherit system;
-          specialArgs = { inherit user; inherit pkgs-unstable; };
+          specialArgs = { inherit user; };
          modules = [
            ./modules
            ./hosts/torus/configuration.nix
@ -76,7 +71,7 @@

        bulwark = lib.nixosSystem {
          inherit system;
-          specialArgs = { inherit user; inherit pkgs-unstable; inherit jovian-nixos; inherit home-manager; };
+          specialArgs = { inherit user; inherit jovian-nixos; inherit home-manager; };
          modules = [
            ./modules
            ./hosts/bulwark/configuration.nix
--- a/provision/hosts/bulwark/configuration.nix
+++ b/provision/hosts/bulwark/configuration.nix
@ -1,4 +1,4 @@
-{ config, lib, pkgs, pkgs-unstable, user, ... }:
+{ config, lib, pkgs, user, ... }:
 {
 imports = [
    ./steam-deck.nix
@ -42,7 +42,7 @@
  i18n.defaultLocale = "en_US.UTF-8";

  # Add fonts
-  fonts.fonts = with pkgs; [
+  fonts.packages= with pkgs; [
    nerdfonts
  ];

@ -94,10 +94,11 @@
    system = {
      ssh.enable = true;
      terminal.enable = true;
+      secrets.enable = true;
      wireguard-client.enable = false;
    };
  };

  # Did you read the comment?
-  system.stateVersion = "23.05"; 
+  system.stateVersion = "23.11"; 
 }
--- a/provision/hosts/bulwark/home-configuration.nix
+++ b/provision/hosts/bulwark/home-configuration.nix
@ -18,5 +18,5 @@
  #modules = {
  #};

-  home.stateVersion = "23.05";
+  home.stateVersion = "23.11";
 }
--- a/provision/hosts/bulwark/steam-deck.nix
+++ b/provision/hosts/bulwark/steam-deck.nix
@ -1,4 +1,4 @@
-{ config, lib, pkgs, pkgs-unstable, user, jovian-nixos, home-manager, ... }:
+{ config, lib, pkgs, user, jovian-nixos, home-manager, ... }:
 {
  imports = [
    (jovian-nixos + "/modules")
--- a/provision/hosts/bulwark/syncthing.nix
+++ b/provision/hosts/bulwark/syncthing.nix
@ -8,14 +8,15 @@
  services.syncthing = {
    enable = true;
    user = "${user}";
+    dataDir = "/home/${user}";
    configDir = "/home/${user}/.config/syncthing";
    guiAddress = "0.0.0.0:8384";
    overrideDevices = true;
    overrideFolders = true; 
-    devices = {
+    settings.devices = {
      "kestrel" = { id = "TY6I6UK-YWXZYB4-7DKSB5Y-6ZBGE6U-T5WNJK4-KPLTXP7-ZTZQPXU-LX4HPQZ"; };
    };
-    folders = {
+    settings.folders = {
      "Gamecube Saves" = {
        path = "/home/${user}/.local/share/dolphin-emu/GC";
        devices = [ "kestrel" ];
--- a/provision/hosts/kestrel/configuration.nix
+++ b/provision/hosts/kestrel/configuration.nix
@ -1,4 +1,4 @@
-{ config, pkgs, pkgs-unstable, user, lib, ... }:
+{ config, pkgs, user, lib, ... }:
 {
  imports = [ 
    ./syncthing.nix
@ -44,7 +44,7 @@
  i18n.defaultLocale = "en_US.UTF-8";

  # Add fonts
-  fonts.fonts = with pkgs; [
+  fonts.packages = with pkgs; [
    nerdfonts
  ];

@ -111,5 +111,5 @@
  };

  # Did you read the comment?
-  system.stateVersion = "23.05";
+  system.stateVersion = "23.11";
 }
--- a/provision/hosts/kestrel/home-configuration.nix
+++ b/provision/hosts/kestrel/home-configuration.nix
@ -28,5 +28,5 @@
    };
  };

-  home.stateVersion = "23.05";
+  home.stateVersion = "23.11";
 }
--- a/provision/hosts/kestrel/syncthing.nix
+++ b/provision/hosts/kestrel/syncthing.nix
@ -8,15 +8,16 @@
  services.syncthing = {
    enable = true;
    user = "${user}";
+    dataDir = "/home/${user}";
    configDir = "/home/${user}/.config/syncthing";
    guiAddress = "0.0.0.0:8384";
    overrideDevices = true;
    overrideFolders = true; 
-    devices = {
+    settings.devices = {
      "bulwark" = { id = "B5HZK2V-WA4WSQF-3JAIH4I-C6XQZ6J-EMMAIV5-CCYOA5G-N57GT6A-WH2GCQ2"; };
      "torus" = { id = "WCZYHD7-5Y33SSU-74JHAQR-V7LYMDM-SDG2NTN-DJ2VKF2-DUBBUE5-PU5CGQN"; };
    };
-    folders = {
+    settings.folders = {
      "Gamecube Saves" = {
        path = "/home/${user}/.local/share/dolphin-emu/GC";
        devices = [ "bulwark" ];
--- a/provision/hosts/torus/configuration.nix
+++ b/provision/hosts/torus/configuration.nix
@ -155,5 +155,5 @@
    };
  };
  # Did you read the comment?
-  system.stateVersion = "23.05";
+  system.stateVersion = "23.11";
 }
--- a/provision/hosts/torus/home-configuration.nix
+++ b/provision/hosts/torus/home-configuration.nix
@ -13,5 +13,5 @@
  #modules = {
  #};

-  home.stateVersion = "23.05";
+  home.stateVersion = "23.11";
 }
--- a/provision/hosts/torus/syncthing.nix
+++ b/provision/hosts/torus/syncthing.nix
@ -8,14 +8,15 @@
  services.syncthing = {
    enable = true;
    user = "${user}";
+    dataDir = "/home/${user}";
    configDir = "/home/${user}/.config/syncthing";
    guiAddress = "0.0.0.0:8384";
    overrideDevices = true;
    overrideFolders = true; 
-    devices = {
+    settings.devices = {
      "kestrel" = { id = "TY6I6UK-YWXZYB4-7DKSB5Y-6ZBGE6U-T5WNJK4-KPLTXP7-ZTZQPXU-LX4HPQZ"; };
    };
-    folders = {
+    settings.folders = {
    };
  };
 }
--- a/provision/modules/desktop/browser.nix
+++ b/provision/modules/desktop/browser.nix
@ -1,11 +1,11 @@
-{ config, lib, pkgs, pkgs-unstable, user, ... }:
+{ config, lib, pkgs, user, ... }:

 let cfg = config.modules.desktop.browser;

 in {
  options.modules.desktop.browser.enable = lib.mkEnableOption "browser";
  config = lib.mkIf cfg.enable {
-    environment.systemPackages = with pkgs-unstable; [
+    environment.systemPackages = with pkgs; [
      chromium
      google-chrome
      play-with-mpv
@ -42,6 +42,7 @@ in {
          "dbepggeogbaibhgnhhndojpepiihcmeb" # Viumium
          "icpgjfneehieebagbmdbhnlpiopdcmna" # New Tab Redirect
          "hahklcmnfgffdlchjigehabfbiigleji" # Play with MPV
+          "oahiolknhkbpcolgnpljehalnhblolkm" # Shorts Blocker
        ];

        # Setup bookmarks
--- a/provision/modules/desktop/sway.nix
+++ b/provision/modules/desktop/sway.nix
@ -1,4 +1,4 @@
-{ config, lib, pkgs, pkgs-unstable, user, ... }:
+{ config, lib, pkgs, user, ... }:

 let 
    cfg = config.modules.desktop.sway;
--- a/provision/modules/devel/engineering.nix
+++ b/provision/modules/devel/engineering.nix
@ -1,6 +1,6 @@
 # CAD and 3d printing and everything nice

-{ config, lib, pkgs, pkgs-unstable, user, ... }:
+{ config, lib, pkgs, user, ... }:

 let
  cfg = config.modules.devel.engineering;
@ -11,9 +11,6 @@ in {
    environment.systemPackages = with pkgs; [ 
      super-slicer 
      blender 
-    ] ++ [
-      # Freecad is broken right now (https://github.com/NixOS/nixpkgs/issues/263452)
-      #pkgs-unstable.freecad 
    ];
  };
 }
--- a/provision/modules/devel/notes.nix
+++ b/provision/modules/devel/notes.nix
@ -1,4 +1,4 @@
-{ config, lib, pkgs, pkgs-unstable, user, ... }:
+{ config, lib, pkgs, user, ... }:

 let
  cfg = config.modules.devel.notes;
@ -8,12 +8,11 @@ in {
    environment.systemPackages = with pkgs; [
      pandoc
      gollum
+      obsidian
      zk
      # for zk
        bat
        fzf
-    ] ++ [
-      pkgs-unstable.obsidian
    ];
  };
 }
--- a/provision/modules/gaming/steam.nix
+++ b/provision/modules/gaming/steam.nix
@ -1,4 +1,4 @@
-{ config, lib, pkgs, pkgs-unstable, user, ... }:
+{ config, lib, pkgs, user, ... }:

 let cfg = config.modules.gaming.steam;
 in {
@ -14,15 +14,14 @@ in {

    hardware.steam-hardware.enable = true;

-    environment.systemPackages = [ 
-      pkgs.steam
-      pkgs.steamtinkerlaunch
-      pkgs.yuzu-early-access
-      pkgs.dolphin-emu
-      pkgs.ppsspp
-      pkgs.mgba
-      pkgs-unstable.sunshine
-      pkgs-unstable.moonlight-qt
+    environment.systemPackages = with pkgs; [ 
+      steam
+      yuzu-early-access
+      dolphin-emu
+      ppsspp
+      mgba
+      sunshine
+      moonlight-qt
    ];
  };

--- a/provision/modules/system/terminal.nix
+++ b/provision/modules/system/terminal.nix
@ -1,4 +1,4 @@
-{ config, lib, pkgs, pkgs-unstable, user, ... }:
+{ config, lib, pkgs, user, ... }:

 let cfg = config.modules.system.terminal;
 in {
@ -34,14 +34,12 @@ in {
      # for neovim
        nodejs 
        ripgrep
-      # taskwarrior
-      taskopen

-    ] ++ [
-      pkgs-unstable.taskwarrior
+      taskwarrior
      # for taskwarrior
-        pkgs-unstable.taskwarrior-tui
-        pkgs-unstable.timewarrior
+        taskopen
+        taskwarrior-tui
+        timewarrior
    ];

  };
--- a/provision/overlays/steamtinkerlaunch.nix
+++ b/provision/overlays/steamtinkerlaunch.nix
@ -1,10 +0,0 @@
-self: super: {
-  steamtinkerlaunch = super.steamtinkerlaunch.overrideAttrs (old: { 
-    src = super.fetchFromGitHub { 
-      owner = "sonic2kk"; 
-      repo = "steamtinkerlaunch"; 
-      rev = "6ff8371e9c8f8122ab4b532e4649e76509a38666"; 
-      sha256 = "sha256-DsfUcAqSnrLvIbkIJ52OHlNfxaq+mOjimc9x/tOW1dA=";
-    }; 
-  }); 
-}