diff --git a/flake.lock b/flake.lock index 6a82bc0..37e9fd7 100644 --- a/flake.lock +++ b/flake.lock @@ -770,26 +770,6 @@ "type": "github" } }, - "nixspect": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1747725629, - "narHash": "sha256-jEdIW5+SMfX6jVvx/MkMbpXLX9S2b+zsayIC1YJNAaY=", - "owner": "rrvsh", - "repo": "nixspect", - "rev": "28deacc6adeaef69f45af5c8139961a774e1600b", - "type": "github" - }, - "original": { - "owner": "rrvsh", - "repo": "nixspect", - "type": "github" - } - }, "nur": { "inputs": { "flake-parts": [ @@ -912,7 +892,6 @@ "nil": "nil", "nix-index-database": "nix-index-database", "nixpkgs": "nixpkgs_2", - "nixspect": "nixspect", "nur": "nur", "nvf": "nvf", "python-flexseal": "python-flexseal", diff --git a/flake.nix b/flake.nix index 7491ace..2f2cd6f 100644 --- a/flake.nix +++ b/flake.nix @@ -22,8 +22,6 @@ nix-index-database.inputs.nixpkgs.follows = "nixpkgs"; nix-index-database.url = "github:nix-community/nix-index-database"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - nixspect.inputs.nixpkgs.follows = "nixpkgs"; - nixspect.url = "github:rrvsh/nixspect"; nur.inputs.flake-parts.follows = "flake-parts"; nur.inputs.nixpkgs.follows = "nixpkgs"; nur.url = "github:nix-community/NUR"; diff --git a/homes/x86_64-linux/rafiq/cli/multiplexer.nix b/homes/x86_64-linux/rafiq/cli/multiplexer.nix index 700db4a..5d50bdc 100644 --- a/homes/x86_64-linux/rafiq/cli/multiplexer.nix +++ b/homes/x86_64-linux/rafiq/cli/multiplexer.nix @@ -42,6 +42,7 @@ tab_truncate_start_format "..." tab_truncate_end_format "..." + //TODO: disable if we are not on ssh datetime "#[fg=#6C7086,bold] {format}" datetime_format "%H:%M:%S" datetime_timezone "Asia/Singapore" diff --git a/homes/x86_64-linux/rafiq/cli/utilities/git.nix b/homes/x86_64-linux/rafiq/cli/utilities/git.nix index c1730bb..4794310 100644 --- a/homes/x86_64-linux/rafiq/cli/utilities/git.nix +++ b/homes/x86_64-linux/rafiq/cli/utilities/git.nix @@ -6,6 +6,7 @@ gcam = "git commit -am"; gu = "git push"; gy = "git pull"; + gdh = "git diff HEAD"; }; programs.git = { enable = true; diff --git a/homes/x86_64-linux/rafiq/cli/utilities/misc.nix b/homes/x86_64-linux/rafiq/cli/utilities/misc.nix index 0bbe431..353f040 100644 --- a/homes/x86_64-linux/rafiq/cli/utilities/misc.nix +++ b/homes/x86_64-linux/rafiq/cli/utilities/misc.nix @@ -2,7 +2,6 @@ { programs = { nh.enable = true; - pay-respects.enable = true; tealdeer = { enable = true; enableAutoUpdates = true; @@ -16,12 +15,10 @@ nix-index.enable = true; nix-index-database.comma.enable = true; }; - persistDirs = [ - ".local/share/zoxide" - ]; + persistDirs = [ ".local/share/zoxide" ]; home = { shellAliases = { - windows = "systemctl reboot --boot-loader-entry=auto-windows"; + windows = "sudo systemctl reboot --boot-loader-entry=auto-windows"; v = "nvim"; e = "edit"; cd = "z"; @@ -35,8 +32,6 @@ pantheon.deploy pantheon.edit pantheon.commit - pantheon.check - inputs.nixspect.packages."x86_64-linux".nixspect ]; }; diff --git a/homes/x86_64-linux/rafiq/desktop/browser.nix b/homes/x86_64-linux/rafiq/desktop/browser.nix index 7fa9677..69f70f5 100644 --- a/homes/x86_64-linux/rafiq/desktop/browser.nix +++ b/homes/x86_64-linux/rafiq/desktop/browser.nix @@ -22,6 +22,7 @@ let profileCfg = id: { inherit id; settings."extensions.autoDisableScopes" = 0; # Auto enable extensions + #TODO: add default seach unduck and add rest of extensions extensions = { force = true; packages = with firefox-addons; [ diff --git a/homes/x86_64-linux/rafiq/desktop/status-bar.nix b/homes/x86_64-linux/rafiq/desktop/status-bar.nix index 8f097f4..96cfee7 100644 --- a/homes/x86_64-linux/rafiq/desktop/status-bar.nix +++ b/homes/x86_64-linux/rafiq/desktop/status-bar.nix @@ -5,6 +5,7 @@ programs.waybar = { settings = [ { + #TODO: review the rest of the modules to see what else can be added layer = "top"; modules-left = [ "pulseaudio" diff --git a/homes/x86_64-linux/rafiq/desktop/terminal.nix b/homes/x86_64-linux/rafiq/desktop/terminal.nix index 4ffde8b..c5abcbb 100644 --- a/homes/x86_64-linux/rafiq/desktop/terminal.nix +++ b/homes/x86_64-linux/rafiq/desktop/terminal.nix @@ -1,4 +1,5 @@ { home.sessionVariables.TERMINAL = "ghostty -e"; + #TODO: fix image preview programs.ghostty.settings.confirm-close-surface = false; } diff --git a/homes/x86_64-linux/rafiq/desktop/wallpaper.png b/homes/x86_64-linux/rafiq/desktop/wallpaper.png index f3839ff..cabd21f 100644 Binary files a/homes/x86_64-linux/rafiq/desktop/wallpaper.png and b/homes/x86_64-linux/rafiq/desktop/wallpaper.png differ diff --git a/homes/x86_64-linux/rafiq/desktop/window-manager/default.nix b/homes/x86_64-linux/rafiq/desktop/window-manager/default.nix index 47d2954..4ac9e58 100644 --- a/homes/x86_64-linux/rafiq/desktop/window-manager/default.nix +++ b/homes/x86_64-linux/rafiq/desktop/window-manager/default.nix @@ -8,4 +8,5 @@ wayland.windowManager.hyprland.settings = import ./_hyprland/settings.nix { inherit pkgs osConfig lib; }; + # TODO: add gamescope here or in nixos desktop module } diff --git a/packages/check/default.nix b/packages/check/default.nix deleted file mode 100644 index 4039d22..0000000 --- a/packages/check/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ pkgs, ... }: -pkgs.writeShellScriptBin "check" # bash - '' - check_nginx() { - ssh apollo systemctl show nginx | grep '^ExecStart=' | grep -oP ' -c \K[^ ]+' | xargs cat - } - - while [[ $# -gt 0 ]]; do - case "$1" in - nginx) - check_nginx - exit 0 - ;; - *) - echo "Unrecognised parameter." - exit 1 - ;; - esac - done - ''