From 55f4153e63aaa27f33a24ecf2b270404f3d3642f Mon Sep 17 00:00:00 2001 From: harry123 Date: Mon, 21 Jul 2025 14:59:16 +0200 Subject: [PATCH] moved to swaylock-effects and added lix lix should now work - it's using main branch. swaylock-effects is now the default lockscreen on niri --- flake.lock | 256 ++++++++------------- flake.nix | 5 +- home-manager/dotfiles/hyfetch/hyfetch.json | 2 +- home-manager/dotfiles/niri/config.kdl | 2 +- home-manager/home.nix | 121 +++++----- shared/client/niri.nix | 2 +- shared/default.nix | 1 + 7 files changed, 163 insertions(+), 226 deletions(-) diff --git a/flake.lock b/flake.lock index 8295eec..d27e187 100644 --- a/flake.lock +++ b/flake.lock @@ -19,22 +19,6 @@ } }, "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_2": { "flake": false, "locked": { "lastModified": 1747046372, @@ -50,7 +34,7 @@ "type": "github" } }, - "flake-compat_3": { + "flake-compat_2": { "flake": false, "locked": { "lastModified": 1696426674, @@ -66,7 +50,7 @@ "type": "github" } }, - "flake-compat_4": { + "flake-compat_3": { "flake": false, "locked": { "lastModified": 1747046372, @@ -182,9 +166,42 @@ "type": "github" } }, + "flake-utils_2": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flakey-profile": { + "locked": { + "lastModified": 1712898590, + "narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=", + "owner": "lf-", + "repo": "flakey-profile", + "rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d", + "type": "github" + }, + "original": { + "owner": "lf-", + "repo": "flakey-profile", + "type": "github" + } + }, "git-hooks": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_2", "gitignore": "gitignore", "nixpkgs": [ "neovim-nightly-overlay", @@ -320,51 +337,45 @@ "type": "github" } }, - "lix-module": { - "inputs": { - "flake-compat": "flake-compat", - "nix2container": "nix2container", - "nix_2_18": "nix_2_18", - "nixpkgs": [ - "nixpkgsUnstable" - ], - "nixpkgs-regression": "nixpkgs-regression", - "pre-commit-hooks": "pre-commit-hooks" - }, - "locked": { - "lastModified": 1752781014, - "narHash": "sha256-YysnhqUkMUn2unoieY+bMzDW/Te+coK+MnRIKstDYSw=", - "ref": "refs/heads/main", - "rev": "d906c7965be6bd671024934a92a0743a7843680f", - "revCount": 18168, - "type": "git", - "url": "https://git.lix.systems/lix-project/lix.git" - }, - "original": { - "type": "git", - "url": "https://git.lix.systems/lix-project/lix.git" - } - }, - "lowdown-src": { + "lix": { "flake": false, "locked": { - "lastModified": 1633514407, - "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", - "owner": "kristapsdz", - "repo": "lowdown", - "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", - "type": "github" + "lastModified": 1753028704, + "narHash": "sha256-kKueIZ35JZnEXPkRw/h0xXvZgBLSfFW1J9FfpCIz8WQ=", + "rev": "2fc47b65b848aa1c2752b7b4eeb112c2cf3a240f", + "type": "tarball", + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/2fc47b65b848aa1c2752b7b4eeb112c2cf3a240f.tar.gz" }, "original": { - "owner": "kristapsdz", - "repo": "lowdown", - "type": "github" + "type": "tarball", + "url": "https://git.lix.systems/lix-project/lix/archive/main.tar.gz" + } + }, + "lix-module": { + "inputs": { + "flake-utils": "flake-utils", + "flakey-profile": "flakey-profile", + "lix": "lix", + "nixpkgs": [ + "nixpkgsUnstable" + ] + }, + "locked": { + "lastModified": 1751909859, + "narHash": "sha256-gbpuESxl/An4GTh7QEbQRYJozVIxWkwVGbWK0/0GoRc=", + "rev": "4d4c2b8f0a801c91ce5b717c77fe3a17efa1402f", + "type": "tarball", + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/4d4c2b8f0a801c91ce5b717c77fe3a17efa1402f.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz" } }, "miovim": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "nixvim": "nixvim" }, "locked": { @@ -383,12 +394,12 @@ }, "neovim-nightly-overlay": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat", "flake-parts": "flake-parts_3", "git-hooks": "git-hooks", "hercules-ci-effects": "hercules-ci-effects", "neovim-src": "neovim-src", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "treefmt-nix": "treefmt-nix" }, "locked": { @@ -473,50 +484,6 @@ "url": "https://git.rougebordeaux.xyz/misschloe/nix-secrets.git" } }, - "nix2container": { - "flake": false, - "locked": { - "lastModified": 1724996935, - "narHash": "sha256-njRK9vvZ1JJsP8oV2OgkBrpJhgQezI03S7gzskCcHos=", - "owner": "nlewo", - "repo": "nix2container", - "rev": "fa6bb0a1159f55d071ba99331355955ae30b3401", - "type": "github" - }, - "original": { - "owner": "nlewo", - "repo": "nix2container", - "type": "github" - } - }, - "nix_2_18": { - "inputs": { - "flake-compat": [ - "lix-module", - "flake-compat" - ], - "lowdown-src": "lowdown-src", - "nixpkgs": "nixpkgs_2", - "nixpkgs-regression": [ - "lix-module", - "nixpkgs-regression" - ] - }, - "locked": { - "lastModified": 1730375271, - "narHash": "sha256-RrOFlDGmRXcVRV2p2HqHGqvzGNyWoD0Dado/BNlJ1SI=", - "owner": "NixOS", - "repo": "nix", - "rev": "0f665ff6779454f2117dcc32e44380cda7f45523", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "2.18.9", - "repo": "nix", - "type": "github" - } - }, "nixlib": { "locked": { "lastModified": 1736643958, @@ -584,22 +551,6 @@ "type": "github" } }, - "nixpkgs-regression": { - "locked": { - "lastModified": 1643052045, - "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - } - }, "nixpkgsSmall": { "locked": { "lastModified": 1752805216, @@ -633,22 +584,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1705033721, - "narHash": "sha256-K5eJHmL1/kev6WuqyqqbS1cdNnSidIZ3jeqJ7GbrYnQ=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a1982c92d8980a0114372973cbdfe0a307f1bdea", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.05-small", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1751949589, "narHash": "sha256-mgFxAPLWw0Kq+C8P3dRrZrOYEQXOtKuYVlo9xvPntt8=", @@ -664,7 +599,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1751786137, "narHash": "sha256-lIlUKVGCGsh0Q2EA7/6xRtKUZjaQ/ur8uUyY+MynHXQ=", @@ -680,7 +615,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { "lastModified": 1752596105, "narHash": "sha256-lFNVsu/mHLq3q11MuGkMhUUoSXEdQjCHvpReaGP1S2k=", @@ -696,7 +631,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_5": { "locked": { "lastModified": 1752620740, "narHash": "sha256-f3pO+9lg66mV7IMmmIqG4PL3223TYMlnlw+pnpelbss=", @@ -712,7 +647,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_6": { "locked": { "lastModified": 1744868846, "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=", @@ -728,7 +663,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_7": { "locked": { "lastModified": 1750605355, "narHash": "sha256-xT8cPLTxlktxI9vSdoBlAVK7dXgd8IK59j7ZwzkkhnI=", @@ -747,9 +682,9 @@ "nixvim": { "inputs": { "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "nuschtosSearch": "nuschtosSearch", - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1752099138, @@ -767,7 +702,7 @@ }, "nuschtosSearch": { "inputs": { - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_2", "ixx": "ixx", "nixpkgs": [ "miovim", @@ -789,22 +724,6 @@ "type": "github" } }, - "pre-commit-hooks": { - "flake": false, - "locked": { - "lastModified": 1733318908, - "narHash": "sha256-SVQVsbafSM1dJ4fpgyBqLZ+Lft+jcQuMtEL3lQWx2Sk=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "6f4e2a2112050951a314d2733a994fbab94864c6", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, "root": { "inputs": { "alejandra": [ @@ -819,7 +738,7 @@ "nix-flatpak": "nix-flatpak", "nix-secrets": "nix-secrets", "nixos-generators": "nixos-generators", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_5", "nixpkgsSmall": "nixpkgsSmall", "nixpkgsUnstable": "nixpkgsUnstable", "sops-nix": "sops-nix", @@ -850,7 +769,7 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1752544651, @@ -868,8 +787,8 @@ }, "swww": { "inputs": { - "flake-compat": "flake-compat_4", - "nixpkgs": "nixpkgs_8", + "flake-compat": "flake-compat_3", + "nixpkgs": "nixpkgs_7", "rust-overlay": "rust-overlay" }, "locked": { @@ -916,6 +835,21 @@ "type": "github" } }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "treefmt-nix": { "inputs": { "nixpkgs": [ diff --git a/flake.nix b/flake.nix index 064f3ef..7286582 100644 --- a/flake.nix +++ b/flake.nix @@ -47,7 +47,7 @@ catppuccin.url = "github:catppuccin/nix"; swww.url = "github:LGFae/swww"; lix-module = { - url = "git+https://git.lix.systems/lix-project/lix.git"; + url = "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz"; inputs.nixpkgs.follows = "nixpkgsUnstable"; }; }; @@ -65,6 +65,7 @@ nix-flatpak, home-manager, zen-browser, + lix-module, ... }@inputs: let @@ -103,6 +104,7 @@ specialArgs = specialArgs; modules = [ ./hosts/goober/configuration.nix + lix-module.nixosModules.default nix-flatpak.nixosModules.nix-flatpak catppuccin.nixosModules.catppuccin home-manager.nixosModules.home-manager @@ -129,6 +131,7 @@ specialArgs = specialArgs; modules = [ ./hosts/workstation/configuration.nix + lix-module.nixosModules.default nix-flatpak.nixosModules.nix-flatpak catppuccin.nixosModules.catppuccin home-manager.nixosModules.home-manager diff --git a/home-manager/dotfiles/hyfetch/hyfetch.json b/home-manager/dotfiles/hyfetch/hyfetch.json index d43fd7e..ff94858 100644 --- a/home-manager/dotfiles/hyfetch/hyfetch.json +++ b/home-manager/dotfiles/hyfetch/hyfetch.json @@ -8,7 +8,7 @@ "custom_colors": [], "fore_back": null }, - "backend": "neofetch", + "backend": "fastfetch", "args": null, "distro": null, "pride_month_shown": [], diff --git a/home-manager/dotfiles/niri/config.kdl b/home-manager/dotfiles/niri/config.kdl index e834891..f316be9 100644 --- a/home-manager/dotfiles/niri/config.kdl +++ b/home-manager/dotfiles/niri/config.kdl @@ -337,7 +337,7 @@ binds { // Suggested binds for running programs: terminal, app launcher, screen locker. Mod+Return { spawn "footclient"; } Mod+D { spawn "fuzzel"; } - Super+Alt+L { spawn "swaylock"; } + Super+Alt+L { spawn "swaylock --screenshots --clock --indicator --effect-blur 7x5 --effect-vignette 0.5:0.5 --fade-in 0.2"; } // You can also use a shell. Do this if you need pipes, multiple commands, etc. // Note: the entire command goes as a single argument in the end. diff --git a/home-manager/home.nix b/home-manager/home.nix index e1b7e91..25d8ce0 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -21,76 +21,79 @@ # The home.packages option allows you to install Nix packages into your # environment. - home.packages = with pkgs; [ - nerd-fonts.code-new-roman - ffmpegthumbnailer - xfce.tumbler - dm-sans - zoxide - btop - bitwarden-cli - weechat - cava - hyfetch - kittysay - thunderbird-bin - feh - waybar - p7zip - tealdeer + home.packages = + with pkgs; + [ + nerd-fonts.code-new-roman + ffmpegthumbnailer + xfce.tumbler + dm-sans + zoxide + btop + bitwarden-cli + weechat + cava + hyfetch + kittysay + thunderbird-bin + feh + waybar + p7zip + tealdeer - libreoffice-qt + libreoffice-qt - playerctl - wf-recorder + playerctl + wf-recorder - file + file - qbittorrent + qbittorrent - ripgrep - vscode + ripgrep + vscode - zathura - tor-browser + zathura + tor-browser - gammastep - lazygit - # gimp-with-plugins - fzf - lf + gammastep + lazygit + # gimp-with-plugins + fzf + lf - prismlauncher + prismlauncher - wofi - wofi-emoji - obsidian + wofi + wofi-emoji + obsidian - cinny-desktop - audacious - audacious-plugins + cinny-desktop + audacious + audacious-plugins - libsixel - libnotify - unzip - p7zip + libsixel + libnotify + unzip + p7zip - nixfmt-rfc-style - fuzzel - zsh-syntax-highlighting + nixfmt-rfc-style + fuzzel + zsh-syntax-highlighting - cinny-desktop - dysk - rsync - obsidian - papirus-icon-theme - # # You can also create simple shell scripts directly inside your - # # configuration. For example, this adds a command 'my-hello' to your - # # environment: - # (pkgs.writeShellScriptBin "my-hello" '' - # echo "Hello, ${config.home.username}!" - # '') - ]; + cinny-desktop + dysk + rsync + obsidian + papirus-icon-theme + # # You can also create simple shell scripts directly inside your + # # configuration. For example, this adds a command 'my-hello' to your + # # environment: + # (pkgs.writeShellScriptBin "my-hello" '' + # echo "Hello, ${config.home.username}!" + # '') + ] + ++ (if system == "aarch64-darwin" then [ ] else [ swaylock-effects ]); # Home Manager is pretty good at managing dotfiles. The primary way to manage # plain files is through 'home.file'. @@ -165,10 +168,6 @@ automount = true; }; - programs.swaylock = { - enable = true; - }; - # Home Manager can also manage your environment variables through # 'home.sessionVariables'. These will be explicitly sourced when using a # shell provided by Home Manager. If you don't want to manage your shell diff --git a/shared/client/niri.nix b/shared/client/niri.nix index 01cadf4..92a7bea 100644 --- a/shared/client/niri.nix +++ b/shared/client/niri.nix @@ -12,7 +12,7 @@ wl-clipboard xdg-utils sway-contrib.grimshot - swaylock + swaylock-effects swaynotificationcenter nautilus libheif diff --git a/shared/default.nix b/shared/default.nix index 3ec08ae..d45cdee 100644 --- a/shared/default.nix +++ b/shared/default.nix @@ -18,6 +18,7 @@ pkgs.kittysay pkgs.tmux pkgs.fzf + pkgs.fastfetch ]; environment.variables.EDITOR = "nvim";