summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoradikro <adikro@disroot.org>2026-01-28 20:49:07 +0100
committeradikro <adikro@disroot.org>2026-01-28 20:49:07 +0100
commite5036417abe5d3597792f869e2831decd50eba5d (patch)
tree367bf2a9a077a518dbc4efa4d8ec3f333f323630
parent31526e3f2df19777b30d04d6747d57a7a807cdd3 (diff)
repo cleanup
-rw-r--r--README.md0
-rw-r--r--flake.lock60
-rw-r--r--hm/conf/git.nix1
-rw-r--r--hm/env/cursor.nix24
-rw-r--r--hm/env/niri/binds.nix18
-rw-r--r--hm/shell/cli.nix10
-rw-r--r--hosts/desktop/configuration.nix2
-rw-r--r--hosts/desktop/home.nix7
8 files changed, 78 insertions, 44 deletions
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/README.md
diff --git a/flake.lock b/flake.lock
index 5e1f51c..f2200e2 100644
--- a/flake.lock
+++ b/flake.lock
@@ -157,11 +157,11 @@
]
},
"locked": {
- "lastModified": 1769397130,
- "narHash": "sha256-TTM4KV9IHwa181X7afBRbhLJIrgynpDjAXJFMUOWfyU=",
+ "lastModified": 1769622371,
+ "narHash": "sha256-Cs1/+P3ntxl9mOIL7/QtItBAzQJ2xjvTMHv7qw0nFV0=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "c37679d37bdbecf11bbe3c5eb238d89ca4f60641",
+ "rev": "02d763228d8aff317e6e5a319474b6d4d9d826a5",
"type": "github"
},
"original": {
@@ -196,11 +196,11 @@
]
},
"locked": {
- "lastModified": 1769385907,
- "narHash": "sha256-hUbEb7kdoBjB1zyGZA3mpp9oI5RMqC+wZhcO1qK8qZI=",
+ "lastModified": 1769558677,
+ "narHash": "sha256-Fm3HxKGYbZXI2vktMAU7ODLMzkq6X9x20cd8A9wb4cY=",
"owner": "nix-community",
"repo": "neovim-nightly-overlay",
- "rev": "068b3d335c56a2b6499ad623572c3fb48e17cd5f",
+ "rev": "895a9a1b269f662da852832bde52863882c7a253",
"type": "github"
},
"original": {
@@ -212,11 +212,11 @@
"neovim-src": {
"flake": false,
"locked": {
- "lastModified": 1769383511,
- "narHash": "sha256-NCsf5TVBTHR0cMs1yVjfUHiRB89+faHV4Ls+ZXeMNmI=",
+ "lastModified": 1769556336,
+ "narHash": "sha256-Ex7TnHo8DQLGpLB9OdrCMaqsHIlnSYNUx1cJOR+HfO8=",
"owner": "neovim",
"repo": "neovim",
- "rev": "95b03171df223e1fed5de15124a3b9204f37048a",
+ "rev": "027b7d6bbb4f164b95f1588b250a02020d85b029",
"type": "github"
},
"original": {
@@ -237,11 +237,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
},
"locked": {
- "lastModified": 1769429762,
- "narHash": "sha256-kiWNe34XXo7wneh1PzaAPBvueVbjrZ8cCLcW18EB95Y=",
+ "lastModified": 1769582851,
+ "narHash": "sha256-T2a9J3iZ+p+dSmrd8mGgehvXrzwnFlMF22BmBqYHkVg=",
"owner": "sodiboo",
"repo": "niri-flake",
- "rev": "6bb07820013d6164df76c658b2dfab2a634300ac",
+ "rev": "8942525e9d5c79f6b47cffef4992454c9b3f9b69",
"type": "github"
},
"original": {
@@ -270,11 +270,11 @@
"niri-unstable": {
"flake": false,
"locked": {
- "lastModified": 1769397515,
- "narHash": "sha256-VNfKIuHzNYPcaJxG+RxNgY4jK9CPf0nKovRDNFvdgAw=",
+ "lastModified": 1769577126,
+ "narHash": "sha256-v9vz9Rj4MGwPuhGELdvpRKl2HH+xvkgat6VwL0L86Fg=",
"owner": "YaLTeR",
"repo": "niri",
- "rev": "a34ed51586a8a440899396a9746eb413f05045e1",
+ "rev": "f30db163b5748e8cf95c05aba77d0d3736f40543",
"type": "github"
},
"original": {
@@ -292,11 +292,11 @@
]
},
"locked": {
- "lastModified": 1769385793,
- "narHash": "sha256-GtAyfMHGNAf8Oz+Gz0dBO2L/ZyZO7AVmgVOpCr/FZc8=",
+ "lastModified": 1769588191,
+ "narHash": "sha256-h+OoQvvlx2q0XOxIa1j7YmkcGeUVDK0feh/p7txpmCk=",
"owner": "KaylorBen",
"repo": "nixcord",
- "rev": "de37fd12b9344786841e53bc0f3556148d4ce5df",
+ "rev": "924198119c361aa8d5817188bd06c659ab99339c",
"type": "github"
},
"original": {
@@ -307,11 +307,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1769170682,
- "narHash": "sha256-oMmN1lVQU0F0W2k6OI3bgdzp2YOHWYUAw79qzDSjenU=",
+ "lastModified": 1769461804,
+ "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "c5296fdd05cfa2c187990dd909864da9658df755",
+ "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d",
"type": "github"
},
"original": {
@@ -377,11 +377,11 @@
"systems": "systems"
},
"locked": {
- "lastModified": 1769418848,
- "narHash": "sha256-jLSg9IkglcIw64kU1utXxsxXhiVdD45dkh9ZJKaFQ7U=",
+ "lastModified": 1769537308,
+ "narHash": "sha256-N7famD4s2hiDIicr9mJWhUj8l9EULB60+1QN/S+UjeM=",
"owner": "nix-community",
"repo": "nixvim",
- "rev": "c19a0517ddeed4c1548611e42e187048fc2e5dcf",
+ "rev": "7addac6d111837217c16762968a9042eac703f7e",
"type": "github"
},
"original": {
@@ -398,11 +398,11 @@
]
},
"locked": {
- "lastModified": 1769432621,
- "narHash": "sha256-xFzNAiH8YfQ43vEFzJWkMtbrdCRiUMQHU9ZlshVCKvE=",
+ "lastModified": 1769626081,
+ "narHash": "sha256-K4PUhR4EFstOGd1546IQlpcLe4F6dn0cd9z1z4f1zwI=",
"owner": "nix-community",
"repo": "NUR",
- "rev": "b9b683b70566d7eee65b7d9f46beb8444ef2986e",
+ "rev": "4b19fec1bd8d743b0ca3bea3016aa84ca4115dae",
"type": "github"
},
"original": {
@@ -617,11 +617,11 @@
"rust-overlay": "rust-overlay_2"
},
"locked": {
- "lastModified": 1769419437,
- "narHash": "sha256-tlTDzEe+YUDLH7AqR/aK0TP+dzDLOHhuvRBetb1xKKU=",
+ "lastModified": 1769620102,
+ "narHash": "sha256-dCwy6fTkSV22Und5+Jny5fMW6WlJEsH/hF6ucyNztbc=",
"owner": "sxyazi",
"repo": "yazi",
- "rev": "06c665a086538d9d7b637785c6410a49d8bd85cc",
+ "rev": "cfd9a22125caf1df72bc34e185157a76bfaf43e5",
"type": "github"
},
"original": {
diff --git a/hm/conf/git.nix b/hm/conf/git.nix
index 8797a52..b297153 100644
--- a/hm/conf/git.nix
+++ b/hm/conf/git.nix
@@ -7,6 +7,7 @@ in
config = lib.mkIf cfg.enable {
programs.git = {
enable = true;
+ lfs.enable = true;
settings = {
user.name = "adikro";
user.email = "adikro@disroot.org";
diff --git a/hm/env/cursor.nix b/hm/env/cursor.nix
index 49e8313..7b09f43 100644
--- a/hm/env/cursor.nix
+++ b/hm/env/cursor.nix
@@ -1,16 +1,28 @@
-{ config, lib, pkgs, ... }:
+{
+ config,
+ lib,
+ pkgs,
+ ...
+}:
let
cfg = config.hm.env.cursor;
-
- miyabi-cursor-pkg = pkgs.runCommand "miyabi" {} ''
+
+ miyabi-src = pkgs.fetchgit {
+ url = "https://codeberg.org/adikro/nixos-resources.git";
+ rev = "refs/heads/main";
+ sha256 = "sha256-4VxeajQFrZivYbJQ1ERPm18Isnf91tiCK5SAJydHfQc=";
+ fetchLFS = true;
+ };
+
+ miyabi-cursor-pkg = pkgs.runCommand "miyabi" { } ''
mkdir -p $out/share/icons/miyabi
- cp -rv ${../../resources/cursors/miyabi}/* $out/share/icons/miyabi/
+ cp -rvL ${miyabi-src}/cursors/miyabi/* $out/share/icons/miyabi/
'';
in
{
options.hm.env.cursor = {
enableMiyabi = lib.mkEnableOption "Enables the Miyabi cursor";
-
+
size = lib.mkOption {
type = lib.types.int;
default = 24;
@@ -22,7 +34,7 @@ in
home.pointerCursor = {
gtk.enable = true;
x11.enable = true;
- package = miyabi-cursor-pkg;
+ package = miyabi-cursor-pkg;
name = "miyabi";
size = cfg.size;
};
diff --git a/hm/env/niri/binds.nix b/hm/env/niri/binds.nix
index b2031e2..4cf92e0 100644
--- a/hm/env/niri/binds.nix
+++ b/hm/env/niri/binds.nix
@@ -22,10 +22,20 @@ in
wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle && \
wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle
'';
- XF86Tools.action = spawn "sh" "-c" ''
- wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle && \
- wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle
- '';
+ # XF86Tools.action = spawn "sh" "-c" ''
+ # wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle && \
+ # wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle
+ # '';
+ "XF86Tools" = {
+ action = spawn "sh" "-c" ''
+ pkill -9 firefox || true
+ swaylock -f
+ wpctl set-mute @DEFAULT_AUDIO_SINK@ 1
+ wpctl set-mute @DEFAULT_AUDIO_SOURCE@ 1
+ niri msg action power-off-monitors
+ '';
+ repeat = false;
+ };
"Mod+WheelScrollDown".action = focus-column-right;
"Mod+WheelScrollUp".action = focus-column-left;
diff --git a/hm/shell/cli.nix b/hm/shell/cli.nix
index 01aeb67..b02922b 100644
--- a/hm/shell/cli.nix
+++ b/hm/shell/cli.nix
@@ -1,4 +1,9 @@
-{ config, lib, pkgs, ... }:
+{
+ config,
+ lib,
+ pkgs,
+ ...
+}:
let
cfg = config.hm.shell.cli;
in
@@ -31,13 +36,12 @@ in
home.packages = with pkgs; [
nix-search-cli
- magic-wormhole
srm
file
mediainfo
chafa
hexyl
- procs
+ procs
yq-go
tldr
];
diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix
index 1197c3f..8c1f0b5 100644
--- a/hosts/desktop/configuration.nix
+++ b/hosts/desktop/configuration.nix
@@ -85,6 +85,8 @@
};
};
+ programs.firefox.enable = true;
+
boot = {
kernelParams = [ "video=DP-1:2560x1440@240" ];
kernelModules = [ "nct6687" ];
diff --git a/hosts/desktop/home.nix b/hosts/desktop/home.nix
index e274907..f47deb7 100644
--- a/hosts/desktop/home.nix
+++ b/hosts/desktop/home.nix
@@ -1,4 +1,4 @@
-{ username, ... }:
+{ username, pkgs, ... }:
{
imports = [ ../../hm/default.nix ];
@@ -59,6 +59,11 @@
};
};
+ home.packages = with pkgs.sweethome3d; [
+ application
+ furniture-editor
+ ];
+
xdg.mimeApps = {
enable = true;
defaultApplications = {