From 91dc8a7d6a9b417a420064e8d5944988f1d0df4c Mon Sep 17 00:00:00 2001 From: sioodmy Date: Thu, 2 May 2024 21:22:50 +0200 Subject: [PATCH] feat: I'm too fucking tired to write a propper commit message --- flake.lock | 86 +++++++++++++++++++++++---------------- flake.nix | 13 ++---- home/cli/zsh/aliases.nix | 2 +- home/rice/default.nix | 2 +- home/rice/niri/config.nix | 19 +++------ system/server/default.nix | 2 +- 6 files changed, 64 insertions(+), 60 deletions(-) diff --git a/flake.lock b/flake.lock index 9118f168..afb758bf 100644 --- a/flake.lock +++ b/flake.lock @@ -539,11 +539,11 @@ "systems": "systems_8" }, "locked": { - "lastModified": 1713978374, - "narHash": "sha256-jla5Wo0Qt3NEnD0OjNj85BGw0pR4Zlz5uy8AqHH7tuE=", + "lastModified": 1714659497, + "narHash": "sha256-CJH9xc2y0AU+2GQSg2dubcPep/iIwb5f/cr2+0LGBWY=", "owner": "hyprwm", "repo": "hyprlock", - "rev": "415262065fff0a04b229cd00165f346a86a0a73a", + "rev": "9cca0dbb45941e13322ff95796f486676f061c6e", "type": "github" }, "original": { @@ -598,11 +598,11 @@ ] }, "locked": { - "lastModified": 1714645673, - "narHash": "sha256-4lKuOutTKs6YY60x4Skhq6gqKnXAvPSin3DrdW5Y9wQ=", + "lastModified": 1714657926, + "narHash": "sha256-LRGiFwmTuJDF2SKkxiZywxXN2XIQZ3LmkDU9P+CXZtU=", "owner": "YaLTeR", "repo": "niri", - "rev": "5dddc850fcae23289d40623b6c060b88233bf57f", + "rev": "c6d64dae7aae12379d25b2e90630d19aeef5444b", "type": "github" }, "original": { @@ -733,6 +733,22 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1708475490, + "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "0e74ca98a74bc7270d28838369593635a5db3260", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat_2", @@ -775,7 +791,6 @@ "nixpkgs": "nixpkgs", "pre-commit-hooks": "pre-commit-hooks", "schizofox": "schizofox", - "sioodmy-dev": "sioodmy-dev", "treefmt-nix": "treefmt-nix", "website": "website" } @@ -877,29 +892,6 @@ "type": "github" } }, - "sioodmy-dev": { - "inputs": { - "flake-parts": [ - "flake-parts" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709139171, - "narHash": "sha256-KrX0gy8gnhUE65mln64jhlqWPhalxfyJOYWrBMA7AhQ=", - "owner": "sioodmy", - "repo": "sioodmy.github.io", - "rev": "9f55f47d4fb87f1901ffe989127f1bd0ea960d59", - "type": "github" - }, - "original": { - "owner": "sioodmy", - "repo": "sioodmy.github.io", - "type": "github" - } - }, "systems": { "locked": { "lastModified": 1681028828, @@ -1085,14 +1077,40 @@ "type": "github" } }, + "treefmt-nix_2": { + "inputs": { + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1714058656, + "narHash": "sha256-Qv4RBm4LKuO4fNOfx9wl40W2rBbv5u5m+whxRYUMiaA=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "c6aaf729f34a36c445618580a9f95a48f5e4e03f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, "website": { - "flake": false, + "inputs": { + "flake-parts": [ + "flake-parts" + ], + "nixpkgs": [ + "nixpkgs" + ], + "treefmt-nix": "treefmt-nix_2" + }, "locked": { - "lastModified": 1714651832, - "narHash": "sha256-qxEHXKBKPmzALULoDWIdx5ld8I4k/19tE5MbCZhvYWQ=", + "lastModified": 1714676410, + "narHash": "sha256-uiP6EwICE/aIkrPeDiTMkkjMOUPomtUyYNNcQnObXd8=", "owner": "sioodmy", "repo": "website", - "rev": "c3275b55016a26c84e1b50a5727778b1249f30be", + "rev": "708abe433eb22ddcd76c22de2b96d55487f4dc0b", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 01585cb6..66a0ff93 100644 --- a/flake.nix +++ b/flake.nix @@ -123,14 +123,6 @@ }; }; - sioodmy-dev = { - url = "github:sioodmy/sioodmy.github.io"; - inputs = { - nixpkgs.follows = "nixpkgs"; - flake-parts.follows = "flake-parts"; - }; - }; - # a tree-wide formatter treefmt-nix = { url = "github:numtide/treefmt-nix"; @@ -172,7 +164,10 @@ }; website = { url = "github:sioodmy/website"; - flake = false; + inputs = { + nixpkgs.follows = "nixpkgs"; + flake-parts.follows = "flake-parts"; + }; }; }; } diff --git a/home/cli/zsh/aliases.nix b/home/cli/zsh/aliases.nix index e050e060..e76fa19c 100644 --- a/home/cli/zsh/aliases.nix +++ b/home/cli/zsh/aliases.nix @@ -31,7 +31,7 @@ with pkgs; { gpl = "curl https://www.gnu.org/licenses/gpl-3.0.txt -o LICENSE"; agpl = "curl https://www.gnu.org/licenses/agpl-3.0.txt -o LICENSE"; webcam = "ffplay /dev/video0"; - deploy = "nixos-rebuild --target-host root@192.168.21.69 --flake .#iapetus switch"; + deploy = "nixos-rebuild --target-host root@37.27.26.214 --flake .#prometheus switch"; rebuild = "sudo nixos-rebuild switch --flake .#"; g = "git"; n = "nix"; diff --git a/home/rice/default.nix b/home/rice/default.nix index 29a27ad6..4b5ab8d5 100644 --- a/home/rice/default.nix +++ b/home/rice/default.nix @@ -3,9 +3,9 @@ ./foot.nix ./zathura.nix ./dunst.nix - ./fuzzel.nix ./gtk.nix ./waybar + ./fuzzel ./niri ]; } diff --git a/home/rice/niri/config.nix b/home/rice/niri/config.nix index 75733e85..ad58b6a9 100644 --- a/home/rice/niri/config.nix +++ b/home/rice/niri/config.nix @@ -90,11 +90,9 @@ with theme.colors; '' // Suggested binds for running programs: terminal, app launcher, screen locker. Mod+Return { spawn "foot"; } Mod+Space { spawn "fuzzel"; } + Mod+Shift+Period { spawn "emoji"; } Super+Shift+L { spawn "swaylock"; } - // You can also use a shell: - // Mod+T { spawn "bash" "-c" "notify-send hello && exec alacritty"; } - // Example volume keys mappings for PipeWire & WirePlumber. // The allow-when-locked=true property makes them work even when the session is locked. XF86AudioRaiseVolume allow-when-locked=true { spawn "pamixer" "-i" "5"; } @@ -112,8 +110,8 @@ with theme.colors; '' Mod+Up { focus-window-up; } Mod+Right { focus-column-right; } Mod+H { focus-column-left; } - Mod+J { focus-window-down; } - Mod+K { focus-window-up; } + Mod+J { focus-window-or-workspace-down; } + Mod+K { focus-window-or-workspace-up; } Mod+L { focus-column-right; } Mod+Ctrl+Left { move-column-left; } @@ -121,17 +119,10 @@ with theme.colors; '' Mod+Ctrl+Up { move-window-up; } Mod+Ctrl+Right { move-column-right; } Mod+Ctrl+H { move-column-left; } - Mod+Ctrl+J { move-window-down; } - Mod+Ctrl+K { move-window-up; } + Mod+Ctrl+J { move-window-down-or-to-workspace-down; } + Mod+Ctrl+K { move-window-up-or-to-workspace-up; } Mod+Ctrl+L { move-column-right; } - // Alternative commands that move across workspaces when reaching - // the first or last window in a column. - // Mod+J { focus-window-or-workspace-down; } - // Mod+K { focus-window-or-workspace-up; } - // Mod+Ctrl+J { move-window-down-or-to-workspace-down; } - // Mod+Ctrl+K { move-window-up-or-to-workspace-up; } - Mod+Home { focus-column-first; } Mod+End { focus-column-last; } Mod+Ctrl+Home { move-column-to-first; } diff --git a/system/server/default.nix b/system/server/default.nix index 8fd05836..2a80dbe2 100644 --- a/system/server/default.nix +++ b/system/server/default.nix @@ -29,7 +29,7 @@ virtualHosts = { "sioodmy.dev" = { - root = inputs.website; + root = inputs.website.packages.${pkgs.system}.website; enableACME = true; locations."/" = { tryFiles = "$uri $uri.html $uri/ =404";