From ebbc293c6a1ef0b48aa3dfe9a474cabbced2ee9f Mon Sep 17 00:00:00 2001 From: alisceon Date: Sat, 20 Dec 2025 13:03:42 +0100 Subject: [PATCH] empty commit message. --- flake.lock | 30 +++++++++++++++--------------- home/conf/xonsh/xonshrc | 2 +- hosts/common/wm/gnome.nix | 7 +++++++ hosts/common/workstation.nix | 6 +----- util/thicc-shell.nix | 20 -------------------- 5 files changed, 24 insertions(+), 41 deletions(-) delete mode 100644 util/thicc-shell.nix diff --git a/flake.lock b/flake.lock index 076ff81..587c5d4 100644 --- a/flake.lock +++ b/flake.lock @@ -49,11 +49,11 @@ ] }, "locked": { - "lastModified": 1765384171, - "narHash": "sha256-FuFtkJrW1Z7u+3lhzPRau69E0CNjADku1mLQQflUORo=", + "lastModified": 1765979862, + "narHash": "sha256-/r9/1KamvbHJx6I40H4HsSXnEcBAkj46ZwibhBx9kg0=", "owner": "nix-community", "repo": "home-manager", - "rev": "44777152652bc9eacf8876976fa72cc77ca8b9d8", + "rev": "d3135ab747fd9dac250ffb90b4a7e80634eacbe9", "type": "github" }, "original": { @@ -65,11 +65,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1765311797, - "narHash": "sha256-mSD5Ob7a+T2RNjvPvOA1dkJHGVrNVl8ZOrAwBjKBDQo=", + "lastModified": 1765838191, + "narHash": "sha256-m5KWt1nOm76ILk/JSCxBM4MfK3rYY7Wq9/TZIIeGnT8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "09eb77e94fa25202af8f3e81ddc7353d9970ac1b", + "rev": "c6f52ebd45e5925c188d1a20119978aa4ffd5ef6", "type": "github" }, "original": { @@ -81,11 +81,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1765186076, - "narHash": "sha256-hM20uyap1a0M9d344I692r+ik4gTMyj60cQWO+hAYP8=", + "lastModified": 1766070988, + "narHash": "sha256-G/WVghka6c4bAzMhTwT2vjLccg/awmHkdKSd2JrycLc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "addf7cf5f383a3101ecfba091b98d0a1263dc9b8", + "rev": "c6245e83d836d0433170a16eb185cefe0572f8b8", "type": "github" }, "original": { @@ -103,11 +103,11 @@ ] }, "locked": { - "lastModified": 1765478879, - "narHash": "sha256-40MDB5qv9QOftCrduVTD2DjX76bXycTzvDZoQ9+l5Ak=", + "lastModified": 1766228863, + "narHash": "sha256-IdTpci9nG6XHhZKVK6IVx5Lqn5l4w+47J3RH2g7mLdY=", "owner": "nix-community", "repo": "NUR", - "rev": "8d973756ed1d3152c273af69431fde7d67472b84", + "rev": "416eaed9cb2d0876683ccc0c13d678f95a6c5cc8", "type": "github" }, "original": { @@ -124,11 +124,11 @@ ] }, "locked": { - "lastModified": 1765478879, - "narHash": "sha256-40MDB5qv9QOftCrduVTD2DjX76bXycTzvDZoQ9+l5Ak=", + "lastModified": 1766228863, + "narHash": "sha256-IdTpci9nG6XHhZKVK6IVx5Lqn5l4w+47J3RH2g7mLdY=", "owner": "nix-community", "repo": "NUR", - "rev": "8d973756ed1d3152c273af69431fde7d67472b84", + "rev": "416eaed9cb2d0876683ccc0c13d678f95a6c5cc8", "type": "github" }, "original": { diff --git a/home/conf/xonsh/xonshrc b/home/conf/xonsh/xonshrc index 9c48004..5069bb1 100644 --- a/home/conf/xonsh/xonshrc +++ b/home/conf/xonsh/xonshrc @@ -48,7 +48,7 @@ if $XONSH_INTERACTIVE: XSH.env['fzf_ssh_binding'] = "c-s" # Ctrl+S XSH.env['fzf_file_binding'] = "c-t" # Ctrl+T XSH.env['fzf_dir_binding'] = "c-g" # Ctrl+G - if $SHELL_TYPE == "THICC": + if $SHELL_THICCNESS == "HIGH": import os import sys import subprocess diff --git a/hosts/common/wm/gnome.nix b/hosts/common/wm/gnome.nix index e1f5639..10c59f7 100644 --- a/hosts/common/wm/gnome.nix +++ b/hosts/common/wm/gnome.nix @@ -30,5 +30,12 @@ gnome-initial-setup gnome-clocks ]; # end gnome.excludePackages + + systemPackages = [ + # GNOME tweaks and extensions + pkgs.gnome-tweaks + pkgs.dconf-editor + pkgs.gnomeExtensions.ddterm + ]; # end systemPackages }; # end environment } #end file diff --git a/hosts/common/workstation.nix b/hosts/common/workstation.nix index 6abac3f..1785ce7 100644 --- a/hosts/common/workstation.nix +++ b/hosts/common/workstation.nix @@ -47,6 +47,7 @@ # Chat pkgs.discord pkgs.signal-desktop + pkgs.mumble # Browser pkgs.firefox @@ -58,11 +59,6 @@ pkgs.devenv pkgs.direnv - # GNOME tweaks and extensions - pkgs.gnome-tweaks - pkgs.dconf-editor - pkgs.gnomeExtensions.ddterm - # Other pkgs.syncthing pkgs.steam diff --git a/util/thicc-shell.nix b/util/thicc-shell.nix deleted file mode 100644 index ea87079..0000000 --- a/util/thicc-shell.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ pkgs ? import {} }: - -pkgs.mkShell { - name = "nixos_config"; - - buildInputs = with pkgs; [ - xonsh - python3 - python3Packages.scapy - python3Packages.pyyaml - python3Packages.requests - ]; - - SHELL_TYPE = "THICC"; - - shellHook = '' - echo "NixOS Config Shell" - ${pkgs.xonsh}/bin/xonsh - ''; -} \ No newline at end of file