mirror of
https://gitlab.com/upRootNutrition/dotfiles.git
synced 2025-12-06 21:17:14 -06:00
chore: tried niri again, still hate it
This commit is contained in:
Nick
parent
a6000e5c8b
commit
0f51aa99b1
7 changed files with 158 additions and 37 deletions
118
flake.lock
generated
118
flake.lock
generated
|
|
@ -986,11 +986,69 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"niri": {
|
||||
"inputs": {
|
||||
"niri-stable": "niri-stable",
|
||||
"niri-unstable": "niri-unstable",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"nixpkgs-stable": "nixpkgs-stable",
|
||||
"xwayland-satellite-stable": "xwayland-satellite-stable",
|
||||
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1759635394,
|
||||
"narHash": "sha256-rRf/DW3U9sGx4Gi6UpcKZs0t5C3brJEu7Y7pRAMTgqI=",
|
||||
"owner": "sodiboo",
|
||||
"repo": "niri-flake",
|
||||
"rev": "3c44a443d159d6a11280225c2b752ae9a27131ec",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "sodiboo",
|
||||
"repo": "niri-flake",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"niri-stable": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1756556321,
|
||||
"narHash": "sha256-RLD89dfjN0RVO86C/Mot0T7aduCygPGaYbog566F0Qo=",
|
||||
"owner": "YaLTeR",
|
||||
"repo": "niri",
|
||||
"rev": "01be0e65f4eb91a9cd624ac0b76aaeab765c7294",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "YaLTeR",
|
||||
"ref": "v25.08",
|
||||
"repo": "niri",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"niri-unstable": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1759395653,
|
||||
"narHash": "sha256-sv9J1z6CrTPf9lRJLyCN90fZVdQz7LFeX7pIlInH8BQ=",
|
||||
"owner": "YaLTeR",
|
||||
"repo": "niri",
|
||||
"rev": "ba6e5e082a79901dc89b0d49c5da1b769d652aec",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "YaLTeR",
|
||||
"repo": "niri",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixos-cosmic": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat_3",
|
||||
"nixpkgs": "nixpkgs_6",
|
||||
"nixpkgs-stable": "nixpkgs-stable",
|
||||
"nixpkgs-stable": "nixpkgs-stable_2",
|
||||
"rust-overlay": "rust-overlay_2"
|
||||
},
|
||||
"locked": {
|
||||
|
|
@ -1069,6 +1127,22 @@
|
|||
}
|
||||
},
|
||||
"nixpkgs-stable": {
|
||||
"locked": {
|
||||
"lastModified": 1759580034,
|
||||
"narHash": "sha256-YWo57PL7mGZU7D4WeKFMiW4ex/O6ZolUS6UNBHTZfkI=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "3bcc93c5f7a4b30335d31f21e2f1281cba68c318",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-25.05",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-stable_2": {
|
||||
"locked": {
|
||||
"lastModified": 1751048012,
|
||||
"narHash": "sha256-MYbotu4UjWpTsq01wglhN5xDRfZYLFtNk7SBY0BcjkU=",
|
||||
|
|
@ -1084,7 +1158,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-stable_2": {
|
||||
"nixpkgs-stable_3": {
|
||||
"locked": {
|
||||
"lastModified": 1759281824,
|
||||
"narHash": "sha256-FIBE1qXv9TKvSNwst6FumyHwCRH3BlWDpfsnqRDCll0=",
|
||||
|
|
@ -1100,7 +1174,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-stable_3": {
|
||||
"nixpkgs-stable_4": {
|
||||
"locked": {
|
||||
"lastModified": 1759281824,
|
||||
"narHash": "sha256-FIBE1qXv9TKvSNwst6FumyHwCRH3BlWDpfsnqRDCll0=",
|
||||
|
|
@ -1387,9 +1461,10 @@
|
|||
"linkpage": "linkpage",
|
||||
"lix": "lix",
|
||||
"lix-module": "lix-module",
|
||||
"niri": "niri",
|
||||
"nixos-cosmic": "nixos-cosmic",
|
||||
"nixpkgs": "nixpkgs_7",
|
||||
"nixpkgs-stable": "nixpkgs-stable_2",
|
||||
"nixpkgs-stable": "nixpkgs-stable_3",
|
||||
"nur": "nur",
|
||||
"pre-commit-hooks-nix": "pre-commit-hooks-nix",
|
||||
"sops-nix": "sops-nix",
|
||||
|
|
@ -1691,7 +1766,7 @@
|
|||
"flake-parts": "flake-parts_5",
|
||||
"mkElmDerivation": "mkElmDerivation",
|
||||
"nixpkgs": "nixpkgs_9",
|
||||
"nixpkgs-stable": "nixpkgs-stable_3",
|
||||
"nixpkgs-stable": "nixpkgs-stable_4",
|
||||
"treefmt-nix": "treefmt-nix_3"
|
||||
},
|
||||
"locked": {
|
||||
|
|
@ -1792,6 +1867,39 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"xwayland-satellite-stable": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1755491097,
|
||||
"narHash": "sha256-m+9tUfsmBeF2Gn4HWa6vSITZ4Gz1eA1F5Kh62B0N4oE=",
|
||||
"owner": "Supreeeme",
|
||||
"repo": "xwayland-satellite",
|
||||
"rev": "388d291e82ffbc73be18169d39470f340707edaa",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "Supreeeme",
|
||||
"ref": "v0.7",
|
||||
"repo": "xwayland-satellite",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"xwayland-satellite-unstable": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1759449168,
|
||||
"narHash": "sha256-Ka18wfIaNvTN9sr+PBie6P83959Om4j5P62M4RwNeoY=",
|
||||
"owner": "Supreeeme",
|
||||
"repo": "xwayland-satellite",
|
||||
"rev": "da6693c88ab5edac2ec3c81730f112be67abe278",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "Supreeeme",
|
||||
"repo": "xwayland-satellite",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"yazi": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils_3",
|
||||
|
|
|
|||
|
|
@ -42,6 +42,10 @@
|
|||
url = "github:helix-editor/helix";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
niri = {
|
||||
url = "github:sodiboo/niri-flake";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
nixos-cosmic.url = "github:lilyinstarlight/nixos-cosmic";
|
||||
hyprland = {
|
||||
url = "github:hyprwm/Hyprland";
|
||||
|
|
@ -99,7 +103,8 @@
|
|||
config.nixosModules.core
|
||||
config.nixosModules.mantle
|
||||
config.nixosModules.crust
|
||||
inputs.nixos-cosmic.nixosModules.default
|
||||
inputs.niri.nixosModules.niri
|
||||
# inputs.nixos-cosmic.nixosModules.default
|
||||
inputs.home-manager.nixosModules.home-manager
|
||||
inputs.lix-module.nixosModules.default
|
||||
inputs.nur.modules.nixos.default
|
||||
|
|
|
|||
|
|
@ -60,6 +60,7 @@ in
|
|||
claudeCode
|
||||
puddleTag
|
||||
academic
|
||||
# niri
|
||||
hypr
|
||||
wayland
|
||||
theming
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ with pkgs.vscode-extensions;
|
|||
ms-vscode.test-adapter-converter
|
||||
haskell.haskell
|
||||
justusadam.language-haskell
|
||||
jnoortheen.nix-ide
|
||||
james-yu.latex-workshop
|
||||
bbenoist.nix
|
||||
mattn.lisp
|
||||
|
|
@ -14,6 +15,5 @@ with pkgs.vscode-extensions;
|
|||
pkief.material-icon-theme
|
||||
streetsidesoftware.code-spell-checker
|
||||
tamasfe.even-better-toml
|
||||
brettm12345.nixfmt-vscode
|
||||
thenuprojectcontributors.vscode-nushell-lang
|
||||
]
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
config,
|
||||
flake,
|
||||
osConfig,
|
||||
workspaceStrings,
|
||||
...
|
||||
}:
|
||||
let
|
||||
|
|
@ -29,6 +30,7 @@ in
|
|||
"Super+h".action = niri.spawn "feishin";
|
||||
"Super+g".action = niri.spawn "scrcpy";
|
||||
"Super+e".action = niri.spawn "ghostty -e nu -e y";
|
||||
"Super+f".action = niri.spawn "ghostty -e zellij a dotfiles";
|
||||
"Super+s".action = niri.spawn "steam";
|
||||
"Super+n".action = niri.spawn "signal-desktop";
|
||||
"Super+t".action = niri.spawn "zeditor";
|
||||
|
|
@ -42,33 +44,37 @@ in
|
|||
"Super+Space".action = niri.spawn "fuzzel";
|
||||
|
||||
"Super+Tab".action = niri.close-window;
|
||||
"Super+u".action = niri.maximize-column;
|
||||
"Super+comma".action = niri.focus-workspace-down;
|
||||
"Super+period".action = niri.focus-workspace-up;
|
||||
"Super+a".action = niri.maximize-column;
|
||||
"Super+left".action = niri.move-column-left;
|
||||
"Super+right".action = niri.move-column-right;
|
||||
"Super+f".action = niri.fullscreen-window;
|
||||
"Super+Shift+Tab".action = niri.fullscreen-window;
|
||||
"Super+q".action = niri.switch-preset-column-width;
|
||||
"Super+minus".action = niri.set-column-width "-10%";
|
||||
"Super+plus".action = niri.set-column-width "+10%";
|
||||
"Super+equal".action = niri.set-column-width "+10%";
|
||||
|
||||
"Ctrl+Alt+Down".action = niri.move-window-down-or-to-workspace-down;
|
||||
"Ctrl+Alt+Up".action = niri.move-window-up-or-to-workspace-up;
|
||||
"Ctrl+Alt+Left".action = niri.consume-or-expel-window-left;
|
||||
"Ctrl+Alt+Right".action = niri.consume-or-expel-window-right;
|
||||
|
||||
# "Ctrl+Alt+1".action = niri.move-column-to-workspace workspaceStrings.workspace4;
|
||||
# "Ctrl+Alt+2".action = niri.move-column-to-workspace workspaceStrings.workspace2;
|
||||
# "Ctrl+Alt+3".action = niri.move-column-to-workspace workspaceStrings.workspace3;
|
||||
# "Ctrl+Alt+4".action = niri.move-column-to-workspace workspaceStrings.workspace0;
|
||||
# "Ctrl+Alt+5".action = niri.move-column-to-workspace workspaceStrings.workspace1;
|
||||
|
||||
# "Ctrl+Alt+1".action = niri.move-window-to-workspace workspaceStrings.workspace0
|
||||
# "Ctrl+Alt+2".action = niri.move-window-to-workspace workspaceStrings.workspace1
|
||||
# "Ctrl+Alt+3".action = niri.move-window-to-workspace workspaceStrings.workspace2
|
||||
# "Ctrl+Alt+4".action = niri.move-window-to-workspace workspaceStrings.workspace3
|
||||
# "Ctrl+Alt+5".action = niri.move-window-to-workspace workspaceStrings.workspace4
|
||||
# "Super+Enter".action = niri.toggle-overview;
|
||||
|
||||
# "Super+1".action = niri.focus-workspace workspaceStrings.workspace0;
|
||||
# "Super+2".action = niri.focus-workspace workspaceStrings.workspace1;
|
||||
# "Super+3".action = niri.focus-workspace workspaceStrings.workspace2;
|
||||
# "Super+4".action = niri.focus-workspace workspaceStrings.workspace3;
|
||||
# "Super+5".action = niri.focus-workspace workspaceStrings.workspace4;
|
||||
"Super+1".action = niri.focus-workspace workspaceStrings.workspace4;
|
||||
"Super+2".action = niri.focus-workspace workspaceStrings.workspace2;
|
||||
"Super+3".action = niri.focus-workspace workspaceStrings.workspace3;
|
||||
"Super+4".action = niri.focus-workspace workspaceStrings.workspace0;
|
||||
"Super+5".action = niri.focus-workspace workspaceStrings.workspace1;
|
||||
|
||||
"Super+1".action = niri.focus-column-or-monitor-left;
|
||||
"Super+2".action = niri.focus-window-or-workspace-up;
|
||||
"Super+3".action = niri.focus-window-or-workspace-down;
|
||||
"Super+4".action = niri.focus-column-or-monitor-right;
|
||||
# "Super+1".action = niri.focus-column-or-monitor-left;
|
||||
# "Super+2".action = niri.focus-window-or-workspace-up;
|
||||
# "Super+3".action = niri.focus-window-or-workspace-down;
|
||||
# "Super+4".action = niri.focus-column-or-monitor-right;
|
||||
|
||||
"Super+Shift+s".action = niri.spawn "flameshot gui";
|
||||
"Super+Shift+period".action = niri.spawn "emote";
|
||||
|
|
@ -76,8 +82,8 @@ in
|
|||
"XF86MonBrightnessUp".action = niri.spawn "brightnessctl -d ${deviceLogic "amdgpu_bl1" ""} s +10%";
|
||||
"XF86MonBrightnessDown".action =
|
||||
niri.spawn "brightnessctl -d ${deviceLogic "amdgpu_bl1" ""} s 10%-";
|
||||
"XF86AudioRaiseVolume".action = niri.spawn "pactl set-sink-volume @DEFAULT_SINK@ +5%";
|
||||
"XF86AudioLowerVolume".action = niri.spawn "pactl set-sink-volume @DEFAULT_SINK@ -5%";
|
||||
"XF86AudioMute".action = niri.spawn "pactl set-sink-mute @DEFAULT_SINK@ toggle";
|
||||
"XF86AudioRaiseVolume".action = niri.spawn "wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.05+";
|
||||
"XF86AudioLowerVolume".action = niri.spawn "wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.05-";
|
||||
"XF86AudioMute".action = niri.spawn "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@ in
|
|||
inherit (modules)
|
||||
syncthing
|
||||
ollama
|
||||
# niri
|
||||
hypr
|
||||
wayland
|
||||
network
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{
|
||||
nix.settings = {
|
||||
substituters = [
|
||||
"https://cosmic.cachix.org/"
|
||||
];
|
||||
trusted-public-keys = [
|
||||
"cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE="
|
||||
];
|
||||
};
|
||||
# nix.settings = {
|
||||
# substituters = [
|
||||
# "https://cosmic.cachix.org/"
|
||||
# ];
|
||||
# trusted-public-keys = [
|
||||
# "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE="
|
||||
# ];
|
||||
# };
|
||||
|
||||
environment.sessionVariables.COSMIC_DATA_CONTROL_ENABLED = 1;
|
||||
services = {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue