From a8e75fa4b742bef6c0fd1db6097bb235d2434501 Mon Sep 17 00:00:00 2001 From: 4DBug <4DBug@github.com> Date: Mon, 24 Aug 2026 12:48:35 -0500 Subject: [PATCH] push --- flake.lock | 129 ++++++++++++++++---------- flake.nix | 2 + modules/core/desktop/niri.nix | 53 +++++------ modules/hosts/defaults.nix | 2 + modules/software/essentials.nix | 3 +- modules/software/fish.nix | 2 - modules/software/utilities/fetch.nix | 20 ++++ modules/software/utilities/system.nix | 1 - 8 files changed, 131 insertions(+), 81 deletions(-) create mode 100644 modules/software/utilities/fetch.nix diff --git a/flake.lock b/flake.lock index c0751d2..65b8d99 100644 --- a/flake.lock +++ b/flake.lock @@ -196,6 +196,24 @@ "type": "github" } }, + "fetch": { + "inputs": { + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "lastModified": 1787419291, + "narHash": "sha256-KPUSa2/YT91LIBOA/K7dbitTd92FyU5ZdaKeu5ZmQsU=", + "owner": "areofyl", + "repo": "fetch", + "rev": "070c7a4d38036af65c38c782af5723cea8003d38", + "type": "github" + }, + "original": { + "owner": "areofyl", + "repo": "fetch", + "type": "github" + } + }, "firefox-gnome-theme": { "flake": false, "locked": { @@ -597,7 +615,7 @@ }, "hytale-launcher": { "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1785342502, @@ -631,7 +649,7 @@ "millennium": { "inputs": { "millennium-src": "millennium-src", - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_5" }, "locked": { "dir": "packages/nix", @@ -672,7 +690,7 @@ "metadata": [ "minecraft-metadata" ], - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1785902555, @@ -691,7 +709,7 @@ "minecraft-metadata": { "inputs": { "flake-utils": "flake-utils_4", - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1785898093, @@ -731,7 +749,7 @@ "inputs": { "niri-stable": "niri-stable", "niri-unstable": "niri-unstable", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_8", "nixpkgs-stable": "nixpkgs-stable", "xwayland-satellite-stable": "xwayland-satellite-stable", "xwayland-satellite-unstable": "xwayland-satellite-unstable" @@ -787,7 +805,7 @@ "inputs": { "flake-compat": "flake-compat", "flake-parts": "flake-parts_3", - "nixpkgs": "nixpkgs_8" + "nixpkgs": "nixpkgs_9" }, "locked": { "lastModified": 1785870829, @@ -810,7 +828,7 @@ "nix-gaming": [ "nix-gaming" ], - "nixpkgs": "nixpkgs_9", + "nixpkgs": "nixpkgs_10", "treefmt-nix": "treefmt-nix" }, "locked": { @@ -848,7 +866,7 @@ "flake-compat": "flake-compat_3", "flake-parts": "flake-parts_4", "git-hooks": "git-hooks", - "nixpkgs": "nixpkgs_10" + "nixpkgs": "nixpkgs_11" }, "locked": { "lastModified": 1785898401, @@ -867,7 +885,7 @@ "nixcord": { "inputs": { "flake-parts": "flake-parts_5", - "nixpkgs": "nixpkgs_11", + "nixpkgs": "nixpkgs_12", "nixpkgs-nixcord": "nixpkgs-nixcord", "treefmt-nix": "treefmt-nix_2" }, @@ -890,7 +908,7 @@ "blobs": "blobs", "flake-compat": "flake-compat_4", "git-hooks": "git-hooks_2", - "nixpkgs": "nixpkgs_12" + "nixpkgs": "nixpkgs_13" }, "locked": { "lastModified": 1785702596, @@ -1012,6 +1030,22 @@ } }, "nixpkgs_10": { + "locked": { + "lastModified": 1784796856, + "narHash": "sha256-wWFrV5/Qbm+lyt5x20E/bSbfJiGKMo4RCxZV8cl/WZI=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e2587caef70cea85dd97d7daab492899902dbf5d", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_11": { "locked": { "lastModified": 1785542685, "narHash": "sha256-sjfvXMbG5pCFgpvw2OZAFcZiTvrppCWvnB6cuGrSY08=", @@ -1027,7 +1061,7 @@ "type": "github" } }, - "nixpkgs_11": { + "nixpkgs_12": { "locked": { "lastModified": 1785386831, "narHash": "sha256-sPS3CaXH8RAT3FZRuy4VcV47iuYIWMMfa0GbyJKC3o4=", @@ -1043,7 +1077,7 @@ "type": "github" } }, - "nixpkgs_12": { + "nixpkgs_13": { "locked": { "lastModified": 1785672624, "narHash": "sha256-TWz27RiQZf38j17BYGN/V4U2SQVtOE2pFc9u2cy3H3g=", @@ -1059,7 +1093,7 @@ "type": "github" } }, - "nixpkgs_13": { + "nixpkgs_14": { "locked": { "lastModified": 1785747939, "narHash": "sha256-D740uKsMbgsfK2oaDenJLLPIZfq7W0/g4KN/Fls8eKs=", @@ -1091,6 +1125,22 @@ } }, "nixpkgs_3": { + "locked": { + "lastModified": 1781577229, + "narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "567a49d1913ce81ac6e9582e3553dd90a955875f", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { "locked": { "lastModified": 1785090369, "narHash": "sha256-m0pDuRJG7EDo9ri+4Ksu83VsI+PlxNC9lNBfydejce4=", @@ -1106,7 +1156,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1781577229, "narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=", @@ -1122,21 +1172,6 @@ "type": "github" } }, - "nixpkgs_5": { - "locked": { - "lastModified": 1785896855, - "narHash": "sha256-9ZUVm/loWdcMqG7Y/UJIwDRrPvpIwa0kLuxqGh0wBXI=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "356468b500e85491b610431c87a284ca1f41b7bc", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_6": { "locked": { "lastModified": 1785896855, @@ -1153,6 +1188,21 @@ } }, "nixpkgs_7": { + "locked": { + "lastModified": 1785896855, + "narHash": "sha256-9ZUVm/loWdcMqG7Y/UJIwDRrPvpIwa0kLuxqGh0wBXI=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "356468b500e85491b610431c87a284ca1f41b7bc", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_8": { "locked": { "lastModified": 1785828668, "narHash": "sha256-8fsyqeO+mJqvIzeO4xIpgJe/f7MTbbVTEC6RT6WSXNs=", @@ -1168,7 +1218,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_9": { "locked": { "lastModified": 1785859399, "narHash": "sha256-pY4X50au95QrTpAbEm08pURmeU3/Ud2oa0s2XzpDdz8=", @@ -1184,22 +1234,6 @@ "type": "github" } }, - "nixpkgs_9": { - "locked": { - "lastModified": 1784796856, - "narHash": "sha256-wWFrV5/Qbm+lyt5x20E/bSbfJiGKMo4RCxZV8cl/WZI=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "e2587caef70cea85dd97d7daab492899902dbf5d", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "noctalia": { "inputs": { "nixpkgs": [ @@ -1252,6 +1286,7 @@ "catppuccin-userstyles-nix": "catppuccin-userstyles-nix", "copyparty": "copyparty", "den": "den", + "fetch": "fetch", "flake-aspects": "flake-aspects", "flake-file": "flake-file", "flake-parts": "flake-parts_2", @@ -1269,7 +1304,7 @@ "nix-gaming": "nix-gaming", "nixcord": "nixcord", "nixos-mailserver": "nixos-mailserver", - "nixpkgs": "nixpkgs_13", + "nixpkgs": "nixpkgs_14", "nixpkgs-lib": [ "nixpkgs" ], diff --git a/flake.nix b/flake.nix index 28d8d5a..459821b 100644 --- a/flake.nix +++ b/flake.nix @@ -91,5 +91,7 @@ nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver"; millennium.url = "github:SteamClientHomebrew/Millennium?dir=packages/nix"; + + fetch.url = "github:areofyl/fetch"; }; } diff --git a/modules/core/desktop/niri.nix b/modules/core/desktop/niri.nix index 810f57b..6d1ad40 100644 --- a/modules/core/desktop/niri.nix +++ b/modules/core/desktop/niri.nix @@ -23,6 +23,10 @@ xkb.layout = "us,ua"; }; + input.touchpad = { + click-method = "clickfinger"; + }; + layout = { gaps = 10; border.enable = false; @@ -72,7 +76,7 @@ binds = { "Mod+T".action.spawn = "cosmic-term"; - "Mod+D".action.spawn-sh = "noctalia msg panel-toggle launcher"; + "Mod+A".action.spawn-sh = "noctalia msg panel-toggle launcher"; "Mod+V".action.spawn-sh = "noctalia msg panel-toggle clipboard"; "Mod+N".action.spawn-sh = "noctalia msg panel-toggle control-center"; "Mod+Comma".action.spawn-sh = "noctalia msg settings-toggle"; @@ -95,15 +99,15 @@ "Mod+F".action.switch-preset-column-width = {}; "Mod+Shift+F".action.fullscreen-window = {}; # Focus - "Mod+H".action.focus-column-left = {}; - "Mod+J".action.focus-window-down = {}; - "Mod+K".action.focus-window-up = {}; - "Mod+L".action.focus-column-right = {}; + "Mod+Left".action.focus-column-left = {}; + "Mod+Down".action.focus-window-or-workspace-down = {}; + "Mod+Up".action.focus-window-or-workspace-up = {}; + "Mod+Right".action.focus-column-right = {}; # Move windows - "Mod+Shift+H".action.set-column-width = "-10%"; - "Mod+Shift+L".action.set-column-width = "+10%"; - "Mod+Shift+J".action.set-window-height = "+10%"; - "Mod+Shift+K".action.set-window-height = "-10%"; + "Mod+Shift+Left".action.set-column-width = "-10%"; + "Mod+Shift+Right".action.set-column-width = "+10%"; + "Mod+Shift+Up".action.set-window-height = "+10%"; + "Mod+Shift+Down".action.set-window-height = "-10%"; "Mod+Control+H".action.consume-or-expel-window-left = {}; "Mod+Control+L".action.consume-or-expel-window-right = {}; "Mod+Control+K".action.move-window-up = {}; @@ -121,26 +125,17 @@ "Mod+8".action.focus-workspace = 8; "Mod+9".action.focus-workspace = 9; "Mod+0".action.focus-workspace = 10; - "Mod+Shift+1".action.move-window-to-workspace = [ { focus = false; } 1 ]; - "Mod+Shift+2".action.move-window-to-workspace = [ { focus = false; } 2 ]; - "Mod+Shift+3".action.move-window-to-workspace = [ { focus = false; } 3 ]; - "Mod+Shift+4".action.move-window-to-workspace = [ { focus = false; } 4 ]; - "Mod+Shift+5".action.move-window-to-workspace = [ { focus = false; } 5 ]; - "Mod+Shift+6".action.move-window-to-workspace = [ { focus = false; } 6 ]; - "Mod+Shift+7".action.move-window-to-workspace = [ { focus = false; } 7 ]; - "Mod+Shift+8".action.move-window-to-workspace = [ { focus = false; } 8 ]; - "Mod+Shift+9".action.move-window-to-workspace = [ { focus = false; } 9 ]; - "Mod+Shift+0".action.move-window-to-workspace = [ { focus = false; } 10 ]; - "Mod+Ctrl+1".action.move-window-to-workspace = 1; - "Mod+Ctrl+2".action.move-window-to-workspace = 2; - "Mod+Ctrl+3".action.move-window-to-workspace = 3; - "Mod+Ctrl+4".action.move-window-to-workspace = 4; - "Mod+Ctrl+5".action.move-window-to-workspace = 5; - "Mod+Ctrl+6".action.move-window-to-workspace = 6; - "Mod+Ctrl+7".action.move-window-to-workspace = 7; - "Mod+Ctrl+8".action.move-window-to-workspace = 8; - "Mod+Ctrl+9".action.move-window-to-workspace = 9; - "Mod+Ctrl+0".action.move-window-to-workspace = 10; + + "Mod+Shift+1".action.move-window-to-workspace = 1; + "Mod+Shift+2".action.move-window-to-workspace = 2; + "Mod+Shift+3".action.move-window-to-workspace = 3; + "Mod+Shift+4".action.move-window-to-workspace = 4; + "Mod+Shift+5".action.move-window-to-workspace = 5; + "Mod+Shift+6".action.move-window-to-workspace = 6; + "Mod+Shift+7".action.move-window-to-workspace = 7; + "Mod+Shift+8".action.move-window-to-workspace = 8; + "Mod+Shift+9".action.move-window-to-workspace = 9; + "Mod+Shift+0".action.move-window-to-workspace = 10; }; }; }; diff --git a/modules/hosts/defaults.nix b/modules/hosts/defaults.nix index c4ee29a..cadb926 100644 --- a/modules/hosts/defaults.nix +++ b/modules/hosts/defaults.nix @@ -12,6 +12,8 @@ tailscale fish + + fetch ]; nixos = { ... }: { diff --git a/modules/software/essentials.nix b/modules/software/essentials.nix index 193de5c..5562f8b 100644 --- a/modules/software/essentials.nix +++ b/modules/software/essentials.nix @@ -3,7 +3,6 @@ nixos = { pkgs, ... }: { environment.systemPackages = with pkgs; [ comma - fastfetch git home-manager inetutils @@ -23,4 +22,4 @@ ]; }; }; -} \ No newline at end of file +} diff --git a/modules/software/fish.nix b/modules/software/fish.nix index 35bfc4d..9140f45 100644 --- a/modules/software/fish.nix +++ b/modules/software/fish.nix @@ -3,8 +3,6 @@ nixos = { pkgs, ...}: { programs.fish = { shellAliases = { - fetch = "fastfetch --file ~/nix/nix.ans"; - box = "ssh box.bug.tools"; unbox = "sh -c 'ssh -N -L \"$1\":0.0.0.0:\"$1\" box.bug.tools &' --"; rebox = "sh -c 'fuser -k \"$1\"/tcp' --"; diff --git a/modules/software/utilities/fetch.nix b/modules/software/utilities/fetch.nix new file mode 100644 index 0000000..e099486 --- /dev/null +++ b/modules/software/utilities/fetch.nix @@ -0,0 +1,20 @@ +{ inputs, ... }: { + den.aspects.fetch = { + homeManager = { ... }: { + imports = [ inputs.fetch.homeManagerModules.default ]; + + programs.fetch = { + enable = true; + + info = [ + "os" + "kernel" + "uptime" + ]; + + speed = 1.0; + spin = "xy"; + }; + }; + }; +} diff --git a/modules/software/utilities/system.nix b/modules/software/utilities/system.nix index 4ca38d9..f89bd86 100644 --- a/modules/software/utilities/system.nix +++ b/modules/software/utilities/system.nix @@ -10,7 +10,6 @@ users.users.bug.packages = with pkgs; [ mission-center baobab - fastfetch ]; programs = {