mirror of
https://gitlab.com/upRootNutrition/dotfiles.git
synced 2025-06-16 10:05:13 -05:00
Compare commits
No commits in common. "17d2832b063987c969108f4f2fcf8f0da3f4c12b" and "ac78eea7dbd9209682243c56c8d0c1f1f7a695ef" have entirely different histories.
17d2832b06
...
ac78eea7db
23 changed files with 549 additions and 646 deletions
261
flake.lock
generated
261
flake.lock
generated
|
|
@ -44,11 +44,11 @@
|
||||||
"treefmt-nix": "treefmt-nix"
|
"treefmt-nix": "treefmt-nix"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1746626503,
|
"lastModified": 1744963141,
|
||||||
"narHash": "sha256-mRnIdJLP+0NSim9ao30ue0Z3ttSuxzXwQG7UN1KuKfU=",
|
"narHash": "sha256-OVdHdvP+5bXSmSYeuYmoVgZOD9miU6vM/5ia4c36bxs=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "buildbot-nix",
|
"repo": "buildbot-nix",
|
||||||
"rev": "7ad9b4886eccb5eecc0686a16266ddabf6cbefe9",
|
"rev": "df395905be3183741bb0d207a958ce454ba5057f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -305,7 +305,7 @@
|
||||||
},
|
},
|
||||||
"flake-utils_2": {
|
"flake-utils_2": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"systems": "systems_4"
|
"systems": "systems_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1731533236,
|
"lastModified": 1731533236,
|
||||||
|
|
@ -322,6 +322,24 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"flake-utils_3": {
|
"flake-utils_3": {
|
||||||
|
"inputs": {
|
||||||
|
"systems": "systems_5"
|
||||||
|
},
|
||||||
|
"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"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"flake-utils_4": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"systems": [
|
"systems": [
|
||||||
"ngipkgs",
|
"ngipkgs",
|
||||||
|
|
@ -342,9 +360,9 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"flake-utils_4": {
|
"flake-utils_5": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"systems": "systems_7"
|
"systems": "systems_8"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1731533236,
|
"lastModified": 1731533236,
|
||||||
|
|
@ -385,11 +403,11 @@
|
||||||
"zon2nix": "zon2nix"
|
"zon2nix": "zon2nix"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1747349124,
|
"lastModified": 1746309933,
|
||||||
"narHash": "sha256-X7fd+JEuWQ65OBI733KHtgjelyBm6EgDqMU6mvH5+Jw=",
|
"narHash": "sha256-+NoXOpVFuqIC3EiPBkOT8RVS2RkWSpA5ghBIR3QaGTM=",
|
||||||
"owner": "ghostty-org",
|
"owner": "ghostty-org",
|
||||||
"repo": "ghostty",
|
"repo": "ghostty",
|
||||||
"rev": "e1de7a99e8b5a758fc9e768d13ab15d707edea0a",
|
"rev": "b6f338065eb45935627a51a7d9102019aaeae1c0",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -465,17 +483,18 @@
|
||||||
},
|
},
|
||||||
"helix": {
|
"helix": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
|
"flake-utils": "flake-utils_2",
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
],
|
],
|
||||||
"rust-overlay": "rust-overlay"
|
"rust-overlay": "rust-overlay"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1747313582,
|
"lastModified": 1746193606,
|
||||||
"narHash": "sha256-mCH0h4IytOzW1kc/zyJh6MPfsIbfY0Rsi+lXFsCMo0M=",
|
"narHash": "sha256-LD3ce/SlIY8Wr8XG52EI5t9bNa/peBCXykIJBvcGmO8=",
|
||||||
"owner": "helix-editor",
|
"owner": "helix-editor",
|
||||||
"repo": "helix",
|
"repo": "helix",
|
||||||
"rev": "f157a918a334b6f84730ffa358d766562f81727b",
|
"rev": "12139a4c30ad20d9a1b181de69532a57601cf96f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -498,11 +517,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1744693102,
|
"lastModified": 1742014779,
|
||||||
"narHash": "sha256-1Z4WPGVky4w3lrhrgs89OKsLzPdtkbi1bPLNFWsoLfY=",
|
"narHash": "sha256-I6fG1zrfdLFcp/imGZElig0BJO3YU0QEXLgvwWoOpJ8=",
|
||||||
"owner": "hercules-ci",
|
"owner": "hercules-ci",
|
||||||
"repo": "hercules-ci-effects",
|
"repo": "hercules-ci-effects",
|
||||||
"rev": "5b6cec51c9ec095a0d3fd4c8eeb53eb5c59ae33e",
|
"rev": "524637ef84c177661690b924bf64a1ce18072a2c",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -518,11 +537,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1747340209,
|
"lastModified": 1746317522,
|
||||||
"narHash": "sha256-tUiXrwlJoG3dzJ+fSwv1S3VPU5ODSPZJHoBmlu4t344=",
|
"narHash": "sha256-/jZ4Wd4HHUEWPSlNj48k1E4Mh+1fUbwI/vSlPPIMG3U=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "098e365dd83311cc8236f83ea6be42abb49a6c76",
|
"rev": "621986fed37c5d0cb8df010ed8369694dc47c09b",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -603,15 +622,15 @@
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
],
|
],
|
||||||
"pre-commit-hooks": "pre-commit-hooks",
|
"pre-commit-hooks": "pre-commit-hooks",
|
||||||
"systems": "systems_2",
|
"systems": "systems_3",
|
||||||
"xdph": "xdph"
|
"xdph": "xdph"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1747301504,
|
"lastModified": 1746310409,
|
||||||
"narHash": "sha256-GAI36RNzF9yC0JOauS1+h681ElwdbD9q/qxxuIqcejQ=",
|
"narHash": "sha256-iSyQZMaYjVfr+vb7jO0N9Bh8V9m51ZYUqxWd9BimUpQ=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "Hyprland",
|
"repo": "Hyprland",
|
||||||
"rev": "a5c9b3e49047b4f03f79c5146d8925363eab3072",
|
"rev": "adbae0f74d951e06c575bad3c81a944027dfe413",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -629,7 +648,7 @@
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
],
|
],
|
||||||
"systems": "systems_3"
|
"systems": "systems_4"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1745871725,
|
"lastModified": 1745871725,
|
||||||
|
|
@ -779,11 +798,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1746655412,
|
"lastModified": 1745357019,
|
||||||
"narHash": "sha256-kVQ0bHVtX6baYxRWWIh4u3LNJZb9Zcm2xBeDPOGz5BY=",
|
"narHash": "sha256-q/C3qj9FWHQenObXuw/nGIT8iIsWFjgmcQYcA+ZfpPs=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "hyprlang",
|
"repo": "hyprlang",
|
||||||
"rev": "557241780c179cf7ef224df392f8e67dab6cef83",
|
"rev": "397600c42b8d7a443a5b4e92aa15f46650a90f18",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -833,11 +852,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1746635225,
|
"lastModified": 1745975815,
|
||||||
"narHash": "sha256-W9G9bb0zRYDBRseHbVez0J8qVpD5QbizX67H/vsudhM=",
|
"narHash": "sha256-s3GzsRxBL/N/xYgUXZhQh4t62uR1BN4zxXgWBtJ3lWM=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "hyprutils",
|
"repo": "hyprutils",
|
||||||
"rev": "674ea57373f08b7609ce93baff131117a0dfe70d",
|
"rev": "05878d9470c9e5cbc8807813f9ec2006627a0ca0",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -937,7 +956,7 @@
|
||||||
},
|
},
|
||||||
"lix-module": {
|
"lix-module": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-utils": "flake-utils_2",
|
"flake-utils": "flake-utils_3",
|
||||||
"flakey-profile": "flakey-profile",
|
"flakey-profile": "flakey-profile",
|
||||||
"lix": "lix",
|
"lix": "lix",
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
|
|
@ -960,19 +979,20 @@
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"buildbot-nix": "buildbot-nix",
|
"buildbot-nix": "buildbot-nix",
|
||||||
"dream2nix": "dream2nix",
|
"dream2nix": "dream2nix",
|
||||||
"flake-utils": "flake-utils_3",
|
"flake-utils": "flake-utils_4",
|
||||||
"nixpkgs": "nixpkgs",
|
"nixpkgs": "nixpkgs",
|
||||||
"nixpkgs-stable": "nixpkgs-stable_2",
|
"nixpkgs-stable": "nixpkgs-stable_2",
|
||||||
"pre-commit-hooks": "pre-commit-hooks_2",
|
"pre-commit-hooks": "pre-commit-hooks_2",
|
||||||
"sops-nix": "sops-nix",
|
"sops-nix": "sops-nix",
|
||||||
"systems": "systems_5"
|
"systems": "systems_6",
|
||||||
|
"yants": "yants"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1747343697,
|
"lastModified": 1746282349,
|
||||||
"narHash": "sha256-7WDWTrkb23XYwwzuMZIe2HDDGZOzzv59DW4njuuVTrY=",
|
"narHash": "sha256-2nrI2bq3sOXv3ZyNEXkG9/hezirARjKNJHJxzbAVufY=",
|
||||||
"owner": "ngi-nix",
|
"owner": "ngi-nix",
|
||||||
"repo": "ngipkgs",
|
"repo": "ngipkgs",
|
||||||
"rev": "c58ebe6dc8ce7a513b2b941df601ca1e78c88567",
|
"rev": "4af3e5f735e26b68f2b339361cde14274ea37149",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -993,11 +1013,11 @@
|
||||||
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
|
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1747304844,
|
"lastModified": 1746142190,
|
||||||
"narHash": "sha256-aLS9HqdtAtioT2JJSWQ7cgWKozBmCtxzYWIEZb1RzkA=",
|
"narHash": "sha256-t36K3TWLMRWoGyjYyo+H8bBquDcp4orZqNZVagWNjwY=",
|
||||||
"owner": "sodiboo",
|
"owner": "sodiboo",
|
||||||
"repo": "niri-flake",
|
"repo": "niri-flake",
|
||||||
"rev": "b8326b5bfb204d7b57802a218de1ebbb743bf8dc",
|
"rev": "af701c1c16c289b1b14f333d844b4f756308d244",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1026,11 +1046,11 @@
|
||||||
"niri-unstable": {
|
"niri-unstable": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1747289333,
|
"lastModified": 1746124654,
|
||||||
"narHash": "sha256-S2xNTAo0e87rK+sNDQCxOsBKtQEBAAVwgkzdpnWoQC0=",
|
"narHash": "sha256-LmhkAt2KLvf8lp+kEUQuTFmmv7iXO8IkwwSaPasfXJw=",
|
||||||
"owner": "YaLTeR",
|
"owner": "YaLTeR",
|
||||||
"repo": "niri",
|
"repo": "niri",
|
||||||
"rev": "46a8f81160708d05e9609c318cce64e3e5ac2538",
|
"rev": "6c9705dd4b2eaba25f024d1a3efd7943fd393632",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1047,11 +1067,11 @@
|
||||||
"rust-overlay": "rust-overlay_2"
|
"rust-overlay": "rust-overlay_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1747308097,
|
"lastModified": 1746270539,
|
||||||
"narHash": "sha256-indU9vouoMSHMuB9TTZMsXywj8N5UNOVnCwuA9xh9LM=",
|
"narHash": "sha256-TEJGIS4DALrsnU4599WR+XUD67EEY8LeOXcHnMreKw0=",
|
||||||
"owner": "lilyinstarlight",
|
"owner": "lilyinstarlight",
|
||||||
"repo": "nixos-cosmic",
|
"repo": "nixos-cosmic",
|
||||||
"rev": "3c989494b1968ca066f5893401c9cb8e2202a8f2",
|
"rev": "4a755a6886b93fd8410782172e2356fef0eadccc",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1062,11 +1082,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1746576598,
|
"lastModified": 1744868846,
|
||||||
"narHash": "sha256-FshoQvr6Aor5SnORVvh/ZdJ1Sa2U4ZrIMwKBX5k2wu0=",
|
"narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "b3582c75c7f21ce0b429898980eddbbf05c68e55",
|
"rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1094,11 +1114,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-stable_2": {
|
"nixpkgs-stable_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1746810718,
|
"lastModified": 1744440957,
|
||||||
"narHash": "sha256-VljtYzyttmvkWUKTVJVW93qAsJsrBbgAzy7DdnJaQfI=",
|
"narHash": "sha256-FHlSkNqFmPxPJvy+6fNLaNeWnF1lZSgqVCl/eWaJRc4=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "0c0bf9c057382d5f6f63d54fd61f1abd5e1c2f63",
|
"rev": "26d499fc9f1d567283d5d56fcf367edd815dba1d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1110,11 +1130,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-stable_3": {
|
"nixpkgs-stable_3": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1747209494,
|
"lastModified": 1746055187,
|
||||||
"narHash": "sha256-fLise+ys+bpyjuUUkbwqo5W/UyIELvRz9lPBPoB0fbM=",
|
"narHash": "sha256-3dqArYSMP9hM7Qpy5YWhnSjiqniSaT2uc5h2Po7tmg0=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "5d736263df906c5da72ab0f372427814de2f52f8",
|
"rev": "3e362ce63e16b9572d8c2297c04f7c19ab6725a5",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1126,11 +1146,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-stable_4": {
|
"nixpkgs-stable_4": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1747209494,
|
"lastModified": 1746183838,
|
||||||
"narHash": "sha256-fLise+ys+bpyjuUUkbwqo5W/UyIELvRz9lPBPoB0fbM=",
|
"narHash": "sha256-kwaaguGkAqTZ1oK0yXeQ3ayYjs8u/W7eEfrFpFfIDFA=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "5d736263df906c5da72ab0f372427814de2f52f8",
|
"rev": "bf3287dac860542719fe7554e21e686108716879",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1158,11 +1178,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1747179050,
|
"lastModified": 1746141548,
|
||||||
"narHash": "sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY=",
|
"narHash": "sha256-IgBWhX7A2oJmZFIrpRuMnw5RAufVnfvOgHWgIdds+hc=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "adaa24fbf46737f3f1b5497bf64bae750f82942e",
|
"rev": "f02fddb8acef29a8b32f10a335d44828d7825b78",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1174,11 +1194,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_3": {
|
"nixpkgs_3": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1747179050,
|
"lastModified": 1746232882,
|
||||||
"narHash": "sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY=",
|
"narHash": "sha256-MHmBH2rS8KkRRdoU/feC/dKbdlMkcNkB5mwkuipVHeQ=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "adaa24fbf46737f3f1b5497bf64bae750f82942e",
|
"rev": "7a2622e2c0dbad5c4493cb268aba12896e28b008",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1213,11 +1233,11 @@
|
||||||
"treefmt-nix": "treefmt-nix_2"
|
"treefmt-nix": "treefmt-nix_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1747362365,
|
"lastModified": 1746328741,
|
||||||
"narHash": "sha256-8HTlUnY93Lhs82tDb7WLpTdv6pA9I++iwVbLz8auJHY=",
|
"narHash": "sha256-Gnvu7NWTMK+oS44upQzgL/F6jd0RPFH7XAvHoIfKz+k=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "NUR",
|
"repo": "NUR",
|
||||||
"rev": "ec40131fece2302efdc0f7c7313828e8b7e3e348",
|
"rev": "16ec340127198ee7ecb4f85fb723d8de47b6d94d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1236,11 +1256,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1746537231,
|
"lastModified": 1742649964,
|
||||||
"narHash": "sha256-Wb2xeSyOsCoTCTj7LOoD6cdKLEROyFAArnYoS+noCWo=",
|
"narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=",
|
||||||
"owner": "cachix",
|
"owner": "cachix",
|
||||||
"repo": "git-hooks.nix",
|
"repo": "git-hooks.nix",
|
||||||
"rev": "fa466640195d38ec97cf0493d6d6882bc4d14969",
|
"rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1258,11 +1278,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1746537231,
|
"lastModified": 1742649964,
|
||||||
"narHash": "sha256-Wb2xeSyOsCoTCTj7LOoD6cdKLEROyFAArnYoS+noCWo=",
|
"narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=",
|
||||||
"owner": "cachix",
|
"owner": "cachix",
|
||||||
"repo": "pre-commit-hooks.nix",
|
"repo": "pre-commit-hooks.nix",
|
||||||
"rev": "fa466640195d38ec97cf0493d6d6882bc4d14969",
|
"rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1281,11 +1301,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1746537231,
|
"lastModified": 1742649964,
|
||||||
"narHash": "sha256-Wb2xeSyOsCoTCTj7LOoD6cdKLEROyFAArnYoS+noCWo=",
|
"narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=",
|
||||||
"owner": "cachix",
|
"owner": "cachix",
|
||||||
"repo": "pre-commit-hooks.nix",
|
"repo": "pre-commit-hooks.nix",
|
||||||
"rev": "fa466640195d38ec97cf0493d6d6882bc4d14969",
|
"rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1351,7 +1371,7 @@
|
||||||
"nur": "nur",
|
"nur": "nur",
|
||||||
"pre-commit-hooks-nix": "pre-commit-hooks-nix",
|
"pre-commit-hooks-nix": "pre-commit-hooks-nix",
|
||||||
"sops-nix": "sops-nix_2",
|
"sops-nix": "sops-nix_2",
|
||||||
"systems": "systems_6",
|
"systems": "systems_7",
|
||||||
"waybar": "waybar",
|
"waybar": "waybar",
|
||||||
"yazi": "yazi",
|
"yazi": "yazi",
|
||||||
"zed-editor": "zed-editor"
|
"zed-editor": "zed-editor"
|
||||||
|
|
@ -1386,11 +1406,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1747190175,
|
"lastModified": 1746239644,
|
||||||
"narHash": "sha256-s33mQ2s5L/2nyllhRTywgECNZyCqyF4MJeM3vG/GaRo=",
|
"narHash": "sha256-wMvMBMlpS1H8CQdSSgpLeoCWS67ciEkN/GVCcwk7Apc=",
|
||||||
"owner": "oxalica",
|
"owner": "oxalica",
|
||||||
"repo": "rust-overlay",
|
"repo": "rust-overlay",
|
||||||
"rev": "58160be7abad81f6f8cb53120d5b88c16e01c06d",
|
"rev": "bd32e88bef6da0e021a42fb4120a8df2150e9b8c",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1472,11 +1492,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1746485181,
|
"lastModified": 1744669848,
|
||||||
"narHash": "sha256-PxrrSFLaC7YuItShxmYbMgSuFFuwxBB+qsl9BZUnRvg=",
|
"narHash": "sha256-pXyanHLUzLNd3MX9vsWG+6Z2hTU8niyphWstYEP3/GU=",
|
||||||
"owner": "Mic92",
|
"owner": "Mic92",
|
||||||
"repo": "sops-nix",
|
"repo": "sops-nix",
|
||||||
"rev": "e93ee1d900ad264d65e9701a5c6f895683433386",
|
"rev": "61154300d945f0b147b30d24ddcafa159148026a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1492,11 +1512,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1746485181,
|
"lastModified": 1745310711,
|
||||||
"narHash": "sha256-PxrrSFLaC7YuItShxmYbMgSuFFuwxBB+qsl9BZUnRvg=",
|
"narHash": "sha256-ePyTpKEJTgX0gvgNQWd7tQYQ3glIkbqcW778RpHlqgA=",
|
||||||
"owner": "Mic92",
|
"owner": "Mic92",
|
||||||
"repo": "sops-nix",
|
"repo": "sops-nix",
|
||||||
"rev": "e93ee1d900ad264d65e9701a5c6f895683433386",
|
"rev": "5e3e92b16d6fdf9923425a8d4df7496b2434f39c",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1522,16 +1542,16 @@
|
||||||
},
|
},
|
||||||
"systems_2": {
|
"systems_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1689347949,
|
"lastModified": 1681028828,
|
||||||
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
|
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||||
"owner": "nix-systems",
|
"owner": "nix-systems",
|
||||||
"repo": "default-linux",
|
"repo": "default",
|
||||||
"rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
|
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nix-systems",
|
"owner": "nix-systems",
|
||||||
"repo": "default-linux",
|
"repo": "default",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
@ -1551,6 +1571,21 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"systems_4": {
|
"systems_4": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1689347949,
|
||||||
|
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
|
||||||
|
"owner": "nix-systems",
|
||||||
|
"repo": "default-linux",
|
||||||
|
"rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nix-systems",
|
||||||
|
"repo": "default-linux",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"systems_5": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1681028828,
|
"lastModified": 1681028828,
|
||||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||||
|
|
@ -1565,7 +1600,7 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"systems_5": {
|
"systems_6": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1689347949,
|
"lastModified": 1689347949,
|
||||||
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
|
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
|
||||||
|
|
@ -1580,7 +1615,7 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"systems_6": {
|
"systems_7": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1680978846,
|
"lastModified": 1680978846,
|
||||||
"narHash": "sha256-Gtqg8b/v49BFDpDetjclCYXm8mAnTrUzR0JnE2nv5aw=",
|
"narHash": "sha256-Gtqg8b/v49BFDpDetjclCYXm8mAnTrUzR0JnE2nv5aw=",
|
||||||
|
|
@ -1595,7 +1630,7 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"systems_7": {
|
"systems_8": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1681028828,
|
"lastModified": 1681028828,
|
||||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||||
|
|
@ -1619,11 +1654,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1746216483,
|
"lastModified": 1743748085,
|
||||||
"narHash": "sha256-4h3s1L/kKqt3gMDcVfN8/4v2jqHrgLIe4qok4ApH5x4=",
|
"narHash": "sha256-uhjnlaVTWo5iD3LXics1rp9gaKgDRQj6660+gbUU3cE=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "treefmt-nix",
|
"repo": "treefmt-nix",
|
||||||
"rev": "29ec5026372e0dec56f890e50dbe4f45930320fd",
|
"rev": "815e4121d6a5d504c0f96e5be2dd7f871e4fd99d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1735,11 +1770,11 @@
|
||||||
"xwayland-satellite-unstable": {
|
"xwayland-satellite-unstable": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1747111562,
|
"lastModified": 1745730655,
|
||||||
"narHash": "sha256-GAqhWoxaBIk0tgoecZPa8gTHDHxNc0JtlwWHZN2iOOo=",
|
"narHash": "sha256-Tdsw5lD/XM8i1GnQr7ombqnEaCpt/voPs2AbjuYBbjI=",
|
||||||
"owner": "Supreeeme",
|
"owner": "Supreeeme",
|
||||||
"repo": "xwayland-satellite",
|
"repo": "xwayland-satellite",
|
||||||
"rev": "ec9ff64c1e0cbec42710b580b7c0f759b1694e72",
|
"rev": "56a681bfecc5831f41f8eb0ec8c7e96c6b277153",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1748,18 +1783,34 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"yants": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1645270620,
|
||||||
|
"narHash": "sha256-wwkl3K200UbW9Z7BRlVH8HOEXCaVYP2MqZpsF9EhgZg=",
|
||||||
|
"ref": "refs/heads/canon",
|
||||||
|
"rev": "efeb6dc11eb1a1e88d41dc2093fc5aa31f7abd35",
|
||||||
|
"revCount": 15,
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://code.tvl.fyi/depot.git:/nix/yants.git"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://code.tvl.fyi/depot.git:/nix/yants.git"
|
||||||
|
}
|
||||||
|
},
|
||||||
"yazi": {
|
"yazi": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-utils": "flake-utils_4",
|
"flake-utils": "flake-utils_5",
|
||||||
"nixpkgs": "nixpkgs_4",
|
"nixpkgs": "nixpkgs_4",
|
||||||
"rust-overlay": "rust-overlay_3"
|
"rust-overlay": "rust-overlay_3"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1747290850,
|
"lastModified": 1746209831,
|
||||||
"narHash": "sha256-jx8S0LnBkEonEh3XivYIwpxt+IT/+6/EhPZdAtJgtwI=",
|
"narHash": "sha256-1R1MRxHmTbNUASTCdJTaaIEUevx18+XpVVxEcb0q7VM=",
|
||||||
"owner": "sxyazi",
|
"owner": "sxyazi",
|
||||||
"repo": "yazi",
|
"repo": "yazi",
|
||||||
"rev": "464acfe47b3cbea2713b91d553ff648b8f07ff89",
|
"rev": "a201c93419bede1f35c69a6b8b21ebbf4a752e6e",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1778,11 +1829,11 @@
|
||||||
"rust-overlay": "rust-overlay_4"
|
"rust-overlay": "rust-overlay_4"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1747348132,
|
"lastModified": 1746316904,
|
||||||
"narHash": "sha256-19TI2BpVg22ia7MW5A5eA7RsPfeyd5OUFbcwOcsbKF0=",
|
"narHash": "sha256-+ly8e0TcFGDgQevzgkq6oyzK5bZQUGm4RktKwsmSKKA=",
|
||||||
"owner": "zed-industries",
|
"owner": "zed-industries",
|
||||||
"repo": "zed",
|
"repo": "zed",
|
||||||
"rev": "0f17e821545c2992bda426243751463c4d6e4826",
|
"rev": "425f32e068f7a7a04a0248a06452a2b3ae8c193f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
||||||
|
|
@ -70,7 +70,6 @@ in
|
||||||
wayland
|
wayland
|
||||||
theming
|
theming
|
||||||
printManager
|
printManager
|
||||||
finamp
|
|
||||||
;
|
;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
@ -196,8 +195,6 @@ in
|
||||||
dolphin
|
dolphin
|
||||||
espanso
|
espanso
|
||||||
zotero
|
zotero
|
||||||
printManager
|
|
||||||
finamp
|
|
||||||
;
|
;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -8,28 +8,28 @@
|
||||||
feishin
|
feishin
|
||||||
;
|
;
|
||||||
};
|
};
|
||||||
# xdg.configFile."feishin/config.json".text = ''
|
xdg.configFile."feishin/config.json".text = ''
|
||||||
# {
|
{
|
||||||
# "window_has_frame": true,
|
"window_has_frame": true,
|
||||||
# "bounds": {
|
"bounds": {
|
||||||
# "x": 0,
|
"x": 0,
|
||||||
# "y": 0,
|
"y": 0,
|
||||||
# "width": 2560,
|
"width": 2560,
|
||||||
# "height": 1080
|
"height": 1080
|
||||||
# },
|
},
|
||||||
# "maximized": true,
|
"maximized": true,
|
||||||
# "fullscreen": false,
|
"fullscreen": false,
|
||||||
# "theme": "system",
|
"theme": "system",
|
||||||
# "resume": true,
|
"resume": true,
|
||||||
# "lyrics": [
|
"lyrics": [
|
||||||
# "Genius",
|
"Genius",
|
||||||
# "lrclib.net",
|
"lrclib.net",
|
||||||
# "NetEase"
|
"NetEase"
|
||||||
# ],
|
],
|
||||||
# "window_window_bar_style": "linux",
|
"window_window_bar_style": "linux",
|
||||||
# "window_minimize_to_tray": false,
|
"window_minimize_to_tray": false,
|
||||||
# "window_enable_tray": false,!
|
"window_enable_tray": false,!
|
||||||
# "window_start_minimized": false,
|
"window_start_minimized": false,
|
||||||
# "window_exit_to_tray": false
|
"window_exit_to_tray": false
|
||||||
# }'';
|
}'';
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -8,17 +8,17 @@
|
||||||
vesktop
|
vesktop
|
||||||
;
|
;
|
||||||
};
|
};
|
||||||
# xdg.configFile."vesktop/settings.json".text = ''
|
xdg.configFile."vesktop/settings.json".text = ''
|
||||||
# {
|
{
|
||||||
# "discordBranch": "stable",
|
"discordBranch": "stable",
|
||||||
# "minimizeToTray": false,
|
"minimizeToTray": false,
|
||||||
# "arRPC": true,
|
"arRPC": true,
|
||||||
# "splashColor": "rgb(202, 211, 245)",
|
"splashColor": "rgb(202, 211, 245)",
|
||||||
# "splashBackground": "rgb(36, 39, 58)",
|
"splashBackground": "rgb(36, 39, 58)",
|
||||||
# "customTitleBar": false,
|
"customTitleBar": false,
|
||||||
# "tray": false,
|
"tray": false,
|
||||||
# "staticTitle": false,
|
"staticTitle": false,
|
||||||
# "enableMenu": false
|
"enableMenu": false
|
||||||
# }
|
}
|
||||||
# '';
|
'';
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -5,13 +5,6 @@
|
||||||
{
|
{
|
||||||
services.espanso = {
|
services.espanso = {
|
||||||
enable = true;
|
enable = true;
|
||||||
configs = {
|
|
||||||
default = {
|
|
||||||
pre_paste_delay = 0;
|
|
||||||
show_notifications = false;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
package = pkgs.espanso-wayland;
|
package = pkgs.espanso-wayland;
|
||||||
matches = {
|
matches = {
|
||||||
base = {
|
base = {
|
||||||
|
|
|
||||||
|
|
@ -1,21 +1,4 @@
|
||||||
{ flake, osConfig, ... }:
|
|
||||||
|
|
||||||
let
|
let
|
||||||
inherit (flake.config.machines) devices;
|
|
||||||
|
|
||||||
mars = devices.mars.name;
|
|
||||||
deimos = devices.deimos.name;
|
|
||||||
host = osConfig.networking.hostName;
|
|
||||||
|
|
||||||
deviceLogic =
|
|
||||||
d: m:
|
|
||||||
if host == deimos then
|
|
||||||
"${d}"
|
|
||||||
else if host == mars then
|
|
||||||
"${m}"
|
|
||||||
else
|
|
||||||
"";
|
|
||||||
|
|
||||||
superBinds = builtins.map (x: "SUPER, " + x) [
|
superBinds = builtins.map (x: "SUPER, " + x) [
|
||||||
# Apps
|
# Apps
|
||||||
"Z, exec, obsidian"
|
"Z, exec, obsidian"
|
||||||
|
|
@ -48,8 +31,8 @@ let
|
||||||
"F, splitratio, 0.33"
|
"F, splitratio, 0.33"
|
||||||
"O, splitratio, -0.33"
|
"O, splitratio, -0.33"
|
||||||
# Audio
|
# Audio
|
||||||
"Page_Up, exec, playerctl next"
|
"PageUp, exec, playerctl next"
|
||||||
"Page_Down, exec, playerctl previous"
|
"PageDown, exec, playerctl previous"
|
||||||
"Home, exec, playerctl play-pause"
|
"Home, exec, playerctl play-pause"
|
||||||
"Space, exec, fuzzel"
|
"Space, exec, fuzzel"
|
||||||
];
|
];
|
||||||
|
|
@ -102,14 +85,6 @@ let
|
||||||
# Ctrl+shift binds
|
# Ctrl+shift binds
|
||||||
# "End, exec, shutdown now"
|
# "End, exec, shutdown now"
|
||||||
];
|
];
|
||||||
|
|
||||||
functionBinds = builtins.map (x: " , " + x) [
|
|
||||||
"XF86MonBrightnessUp, exec, brightnessctl -d ${deviceLogic "amdgpu_bl1" ""} s +10%"
|
|
||||||
"XF86MonBrightnessDown, exec, brightnessctl -d ${deviceLogic "amdgpu_bl1" ""} s 10%-"
|
|
||||||
"XF86AudioRaiseVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ +5%"
|
|
||||||
"XF86AudioLowerVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ -5%"
|
|
||||||
"XF86AudioMute, exec, pactl set-sink-mute @DEFAULT_SINK@ toggle"
|
|
||||||
];
|
|
||||||
in
|
in
|
||||||
superBinds
|
superBinds
|
||||||
++ superShiftBinds
|
++ superShiftBinds
|
||||||
|
|
@ -118,6 +93,5 @@ superBinds
|
||||||
++ ctrlBinds
|
++ ctrlBinds
|
||||||
++ ctrlShiftBinds
|
++ ctrlShiftBinds
|
||||||
++ shiftBinds
|
++ shiftBinds
|
||||||
++ functionBinds
|
|
||||||
# Docs
|
# Docs
|
||||||
# https://wiki.hyprland.org/Getting-Started/Master-Tutorial/
|
# https://wiki.hyprland.org/Getting-Started/Master-Tutorial/
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
active_opacity = 0.95;
|
active_opacity = 0.95;
|
||||||
inactive_opacity = 0.90;
|
inactive_opacity = 0.90;
|
||||||
fullscreen_opacity = 1;
|
fullscreen_opacity = 1;
|
||||||
rounding = 20;
|
rounding = 10;
|
||||||
dim_inactive = 1;
|
dim_inactive = 1;
|
||||||
dim_strength = 0.05;
|
dim_strength = 0.05;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -24,7 +24,7 @@ let
|
||||||
el = palettes.${themeLogic}.colours;
|
el = palettes.${themeLogic}.colours;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
gaps_in = 2.5;
|
gaps_in = 5;
|
||||||
gaps_out = 5;
|
gaps_out = 5;
|
||||||
border_size = 2;
|
border_size = 2;
|
||||||
"col.active_border" = "rgb(${el.base0E})";
|
"col.active_border" = "rgb(${el.base0E})";
|
||||||
|
|
|
||||||
|
|
@ -1,14 +1,13 @@
|
||||||
{
|
{
|
||||||
flake,
|
flake,
|
||||||
config,
|
config,
|
||||||
osConfig,
|
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
configPath = ./config;
|
configPath = ./config;
|
||||||
configImports = {
|
configImports = {
|
||||||
animations = import (configPath + /animations.nix);
|
animations = import (configPath + /animations.nix);
|
||||||
bind = import (configPath + /bind.nix) { inherit flake osConfig; };
|
bind = import (configPath + /bind.nix);
|
||||||
bindm = import (configPath + /bindm.nix);
|
bindm = import (configPath + /bindm.nix);
|
||||||
binds = import (configPath + /binds.nix);
|
binds = import (configPath + /binds.nix);
|
||||||
# bindl = import (configPath + /bindl.nix);
|
# bindl = import (configPath + /bindl.nix);
|
||||||
|
|
|
||||||
|
|
@ -1,88 +0,0 @@
|
||||||
{
|
|
||||||
config,
|
|
||||||
flake,
|
|
||||||
osConfig,
|
|
||||||
workspaceStrings,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
let
|
|
||||||
niri = config.lib.niri.actions;
|
|
||||||
|
|
||||||
inherit (flake.config.machines) devices;
|
|
||||||
|
|
||||||
mars = devices.mars.name;
|
|
||||||
deimos = devices.deimos.name;
|
|
||||||
host = osConfig.networking.hostName;
|
|
||||||
|
|
||||||
deviceLogic =
|
|
||||||
d: m:
|
|
||||||
if host == deimos then
|
|
||||||
"${d}"
|
|
||||||
else if host == mars then
|
|
||||||
"${m}"
|
|
||||||
else
|
|
||||||
"";
|
|
||||||
in
|
|
||||||
{
|
|
||||||
binds = {
|
|
||||||
"Super+z".action = niri.spawn "obsidian";
|
|
||||||
"Super+l".action = niri.spawn "slack";
|
|
||||||
"Super+h".action = niri.spawn "feishin";
|
|
||||||
"Super+g".action = niri.spawn "scrcpy";
|
|
||||||
"Super+k".action = niri.spawn "ghostty -e nu -e y";
|
|
||||||
"Super+s".action = niri.spawn "steam";
|
|
||||||
"Super+r".action = niri.spawn "ghostty -e zellij a dotfiles";
|
|
||||||
"Super+n".action = niri.spawn "signal-desktop";
|
|
||||||
"Super+t".action = niri.spawn "zeditor";
|
|
||||||
"Super+b".action = niri.spawn "floorp";
|
|
||||||
"Super+x".action = niri.spawn "freetube";
|
|
||||||
"Super+v".action = niri.spawn "vesktop";
|
|
||||||
"Super+m".action = niri.spawn "element-desktop";
|
|
||||||
"Super+d".action = niri.spawn "ghostty";
|
|
||||||
"Super+p".action = niri.spawn "bitwarden";
|
|
||||||
"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+f".action = niri.swap-window-left;
|
|
||||||
"Super+o".action = niri.swap-window-right;
|
|
||||||
|
|
||||||
"Super+w".action = niri.switch-preset-column-width;
|
|
||||||
|
|
||||||
# "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-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+t".action = niri.spawn "ghostty";
|
|
||||||
"Super+Shift+s".action = niri.spawn "flameshot gui";
|
|
||||||
"Super+Shift+period".action = niri.spawn "emote";
|
|
||||||
"Super+Shift+Tab".action = niri.fullscreen-window;
|
|
||||||
|
|
||||||
"Ctrl+Alt+c".action = niri.move-column-left;
|
|
||||||
"Ctrl+Alt+i".action = niri.move-column-right;
|
|
||||||
"Ctrl+Alt+f".action = niri.set-column-width "-10%";
|
|
||||||
"Ctrl+Alt+o".action = niri.set-column-width "+10%";
|
|
||||||
|
|
||||||
"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";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -1,29 +0,0 @@
|
||||||
{ colourHelpers, ... }:
|
|
||||||
{
|
|
||||||
layout = {
|
|
||||||
default-column-width = {
|
|
||||||
proportion = 1.;
|
|
||||||
};
|
|
||||||
preset-column-widths = [
|
|
||||||
{ proportion = 1. / 3.; }
|
|
||||||
{ proportion = 1. / 2.; }
|
|
||||||
{ proportion = 2. / 3.; }
|
|
||||||
{ proportion = 1.; }
|
|
||||||
];
|
|
||||||
border = {
|
|
||||||
enable = true;
|
|
||||||
width = 2;
|
|
||||||
active.color = colourHelpers.makeColour colourHelpers.el.base0E;
|
|
||||||
inactive.color = colourHelpers.makeColour colourHelpers.el.base02;
|
|
||||||
};
|
|
||||||
gaps = 5;
|
|
||||||
shadow = {
|
|
||||||
enable = true;
|
|
||||||
color = colourHelpers.el.base11;
|
|
||||||
draw-behind-window = true;
|
|
||||||
offset.x = 0;
|
|
||||||
offset.y = 0;
|
|
||||||
spread = 3;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -1,14 +0,0 @@
|
||||||
{
|
|
||||||
environment = {
|
|
||||||
DISPLAY = ":0";
|
|
||||||
};
|
|
||||||
|
|
||||||
prefer-no-csd = true;
|
|
||||||
|
|
||||||
hotkey-overlay.skip-at-startup = true;
|
|
||||||
|
|
||||||
input = {
|
|
||||||
focus-follows-mouse.enable = true;
|
|
||||||
mouse.accel-profile = "flat";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -1,39 +0,0 @@
|
||||||
{
|
|
||||||
colourHelpers,
|
|
||||||
flake,
|
|
||||||
osConfig,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
let
|
|
||||||
inherit (flake.config.machines) devices;
|
|
||||||
|
|
||||||
mars = devices.mars.name;
|
|
||||||
deimos = devices.deimos.name;
|
|
||||||
host = osConfig.networking.hostName;
|
|
||||||
|
|
||||||
deviceLogic =
|
|
||||||
d: m:
|
|
||||||
if host == deimos then
|
|
||||||
d
|
|
||||||
else if host == mars then
|
|
||||||
m
|
|
||||||
else
|
|
||||||
null;
|
|
||||||
in
|
|
||||||
{
|
|
||||||
outputs = {
|
|
||||||
"${deviceLogic "eDP-1" "DP-1"}" = {
|
|
||||||
background-color = colourHelpers.makeColour colourHelpers.el.base02;
|
|
||||||
scale = 1.0;
|
|
||||||
mode = {
|
|
||||||
width = deviceLogic 1920 2560;
|
|
||||||
height = 1080;
|
|
||||||
refresh = deviceLogic 59.94 199.92;
|
|
||||||
};
|
|
||||||
position = {
|
|
||||||
x = 0;
|
|
||||||
y = 0;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -1,25 +0,0 @@
|
||||||
{ lib, pkgs, ... }:
|
|
||||||
{
|
|
||||||
spawn-at-startup = [
|
|
||||||
{
|
|
||||||
command = [
|
|
||||||
"${lib.getExe pkgs.xwayland-satellite}"
|
|
||||||
];
|
|
||||||
}
|
|
||||||
{ command = [ "wl-clipboard" ]; }
|
|
||||||
{ command = [ "wpaperd" ]; }
|
|
||||||
{ command = [ "gammastep" ]; }
|
|
||||||
{ command = [ "dunst" ]; }
|
|
||||||
{ command = [ "playerctld" ]; }
|
|
||||||
{ command = [ "waybar" ]; }
|
|
||||||
{ command = [ "nm-applet" ]; }
|
|
||||||
{ command = [ "blueman-applet" ]; }
|
|
||||||
{ command = [ "rfkill block bluetooth" ]; }
|
|
||||||
{ command = [ "rfkill unblock bluetooth" ]; }
|
|
||||||
{ command = [ "easyeffects -r" ]; }
|
|
||||||
{ command = [ "vesktop" ]; }
|
|
||||||
{ command = [ "signal" ]; }
|
|
||||||
{ command = [ "feishin" ]; }
|
|
||||||
{ command = [ "zeditor" ]; }
|
|
||||||
];
|
|
||||||
}
|
|
||||||
|
|
@ -1,55 +0,0 @@
|
||||||
{ flake, ... }:
|
|
||||||
let
|
|
||||||
inherit (flake.config.aesthetics.themes) cursor;
|
|
||||||
in
|
|
||||||
{
|
|
||||||
cursor = {
|
|
||||||
size = cursor.size;
|
|
||||||
theme = "catppuccin-macchiato-dark-cursors";
|
|
||||||
};
|
|
||||||
|
|
||||||
animations = {
|
|
||||||
enable = true;
|
|
||||||
config-notification-open-close = {
|
|
||||||
spring = {
|
|
||||||
damping-ratio = 0.600000;
|
|
||||||
epsilon = 0.001000;
|
|
||||||
stiffness = 1000;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
horizontal-view-movement = {
|
|
||||||
spring = {
|
|
||||||
damping-ratio = 1.000000;
|
|
||||||
epsilon = 0.000100;
|
|
||||||
stiffness = 800;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
window-close = {
|
|
||||||
easing = {
|
|
||||||
curve = "ease-out-quad";
|
|
||||||
duration-ms = 150;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
window-open = {
|
|
||||||
spring = {
|
|
||||||
damping-ratio = 1.000000;
|
|
||||||
epsilon = 0.000100;
|
|
||||||
stiffness = 800;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
window-resize = {
|
|
||||||
spring = {
|
|
||||||
damping-ratio = 1.000000;
|
|
||||||
epsilon = 0.000100;
|
|
||||||
stiffness = 800;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
workspace-switch = {
|
|
||||||
spring = {
|
|
||||||
damping-ratio = 1.000000;
|
|
||||||
epsilon = 0.000100;
|
|
||||||
stiffness = 1000;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -1,126 +0,0 @@
|
||||||
{ workspaceStrings, ... }:
|
|
||||||
{
|
|
||||||
window-rules = [
|
|
||||||
{
|
|
||||||
open-focused = true;
|
|
||||||
}
|
|
||||||
{
|
|
||||||
matches =
|
|
||||||
let
|
|
||||||
windowMatch = c: {
|
|
||||||
app-id = c;
|
|
||||||
is-floating = true;
|
|
||||||
is-focused = true;
|
|
||||||
};
|
|
||||||
appIDs = [
|
|
||||||
".blueman-manager-wrapped"
|
|
||||||
"org.gnome.Calculator"
|
|
||||||
"com.github.wwmm.easyeffects"
|
|
||||||
"emote"
|
|
||||||
"mpv"
|
|
||||||
"vlc"
|
|
||||||
"org.nomacs.ImageLounge"
|
|
||||||
"flameshot"
|
|
||||||
"^.protonvpn-app-wrapped$"
|
|
||||||
"^Picture-in-Picture$"
|
|
||||||
"^Discord Popout$"
|
|
||||||
"^Enter name of file to save to…$"
|
|
||||||
"^File Upload$"
|
|
||||||
".scrcpy-wrapped"
|
|
||||||
"^Battle.net$"
|
|
||||||
];
|
|
||||||
in
|
|
||||||
builtins.map windowMatch appIDs;
|
|
||||||
}
|
|
||||||
{
|
|
||||||
matches =
|
|
||||||
let
|
|
||||||
windowMatch = c: {
|
|
||||||
app-id = c;
|
|
||||||
};
|
|
||||||
appIDs = [
|
|
||||||
"floop"
|
|
||||||
"org.kde.kdenlive"
|
|
||||||
"krita"
|
|
||||||
"mpv"
|
|
||||||
"vlc"
|
|
||||||
"Brave-browser"
|
|
||||||
"org.kde.okular"
|
|
||||||
];
|
|
||||||
in
|
|
||||||
builtins.map windowMatch appIDs;
|
|
||||||
opacity = 1.0;
|
|
||||||
}
|
|
||||||
{
|
|
||||||
matches =
|
|
||||||
let
|
|
||||||
windowMatch = c: {
|
|
||||||
app-id = c;
|
|
||||||
};
|
|
||||||
appIDs = [
|
|
||||||
"signal"
|
|
||||||
"vesktop"
|
|
||||||
];
|
|
||||||
in
|
|
||||||
builtins.map windowMatch appIDs;
|
|
||||||
open-on-workspace = workspaceStrings.workspace0;
|
|
||||||
}
|
|
||||||
{
|
|
||||||
matches =
|
|
||||||
let
|
|
||||||
windowMatch = c: {
|
|
||||||
app-id = c;
|
|
||||||
};
|
|
||||||
appIDs = [
|
|
||||||
"code"
|
|
||||||
"zeditor"
|
|
||||||
];
|
|
||||||
in
|
|
||||||
builtins.map windowMatch appIDs;
|
|
||||||
open-on-workspace = workspaceStrings.workspace1;
|
|
||||||
}
|
|
||||||
{
|
|
||||||
matches =
|
|
||||||
let
|
|
||||||
windowMatch = c: {
|
|
||||||
app-id = c;
|
|
||||||
};
|
|
||||||
appIDs = [
|
|
||||||
"steam"
|
|
||||||
"org.kde.kdenlive"
|
|
||||||
];
|
|
||||||
in
|
|
||||||
builtins.map windowMatch appIDs;
|
|
||||||
open-on-workspace = workspaceStrings.workspace2;
|
|
||||||
}
|
|
||||||
{
|
|
||||||
matches =
|
|
||||||
let
|
|
||||||
windowMatch = c: {
|
|
||||||
app-id = c;
|
|
||||||
};
|
|
||||||
appIDs = [
|
|
||||||
"feishin"
|
|
||||||
".scrcpy-wrapped"
|
|
||||||
];
|
|
||||||
in
|
|
||||||
builtins.map windowMatch appIDs;
|
|
||||||
open-on-workspace = workspaceStrings.workspace3;
|
|
||||||
}
|
|
||||||
{
|
|
||||||
# opacity = 0.90;
|
|
||||||
clip-to-geometry = true;
|
|
||||||
focus-ring.enable = false;
|
|
||||||
geometry-corner-radius =
|
|
||||||
let
|
|
||||||
radius = 10.0;
|
|
||||||
in
|
|
||||||
{
|
|
||||||
top-left = radius;
|
|
||||||
top-right = radius;
|
|
||||||
bottom-left = radius;
|
|
||||||
bottom-right = radius;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
];
|
|
||||||
}
|
|
||||||
|
|
@ -1,20 +0,0 @@
|
||||||
{ workspaceStrings, ... }:
|
|
||||||
{
|
|
||||||
workspaces = {
|
|
||||||
${workspaceStrings.workspace0} = {
|
|
||||||
name = workspaceStrings.workspace0;
|
|
||||||
};
|
|
||||||
${workspaceStrings.workspace1} = {
|
|
||||||
name = workspaceStrings.workspace1;
|
|
||||||
};
|
|
||||||
${workspaceStrings.workspace2} = {
|
|
||||||
name = workspaceStrings.workspace2;
|
|
||||||
};
|
|
||||||
${workspaceStrings.workspace3} = {
|
|
||||||
name = workspaceStrings.workspace3;
|
|
||||||
};
|
|
||||||
${workspaceStrings.workspace4} = {
|
|
||||||
name = workspaceStrings.workspace4;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -3,18 +3,18 @@
|
||||||
flake,
|
flake,
|
||||||
pkgs,
|
pkgs,
|
||||||
lib,
|
lib,
|
||||||
osConfig,
|
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
|
|
||||||
inherit (flake.config.aesthetics.themes) currentTheme palettes;
|
inherit (flake.config.aesthetics.themes) currentTheme palettes cursor;
|
||||||
|
|
||||||
inherit (flake.config.people) user0 user1 user2;
|
inherit (flake.config.people) user0 user1 user2;
|
||||||
|
|
||||||
user = config.home.username;
|
user = config.home.username;
|
||||||
|
|
||||||
colourHelpers = {
|
niri = config.lib.niri.actions;
|
||||||
|
|
||||||
themeLogic =
|
themeLogic =
|
||||||
if user == user0 then
|
if user == user0 then
|
||||||
currentTheme.theme0
|
currentTheme.theme0
|
||||||
|
|
@ -25,50 +25,345 @@ let
|
||||||
else
|
else
|
||||||
currentTheme.theme0;
|
currentTheme.theme0;
|
||||||
|
|
||||||
el = palettes.${colourHelpers.themeLogic}.colours;
|
el = palettes.${themeLogic}.colours;
|
||||||
|
|
||||||
makeColour = c: "#" + c;
|
makeColour = c: "#" + c;
|
||||||
};
|
in
|
||||||
|
{
|
||||||
workspaceStrings = {
|
programs.niri = {
|
||||||
|
settings =
|
||||||
|
let
|
||||||
workspace0 = "messaging";
|
workspace0 = "messaging";
|
||||||
workspace1 = "work";
|
workspace1 = "work";
|
||||||
workspace2 = "gaming";
|
workspace2 = "gaming";
|
||||||
workspace3 = "media";
|
workspace3 = "media";
|
||||||
workspace4 = "extra";
|
workspace4 = "extra";
|
||||||
};
|
|
||||||
|
|
||||||
configPath = ./config;
|
|
||||||
|
|
||||||
configImports =
|
|
||||||
let
|
|
||||||
binds = import (configPath + /binds.nix) {
|
|
||||||
inherit
|
|
||||||
config
|
|
||||||
workspaceStrings
|
|
||||||
flake
|
|
||||||
osConfig
|
|
||||||
;
|
|
||||||
};
|
|
||||||
layout = import (configPath + /layout.nix) { inherit colourHelpers; };
|
|
||||||
main = import (configPath + /main.nix);
|
|
||||||
outputs = import (configPath + /outputs.nix) {
|
|
||||||
inherit
|
|
||||||
flake
|
|
||||||
osConfig
|
|
||||||
colourHelpers
|
|
||||||
;
|
|
||||||
};
|
|
||||||
startup = import (configPath + /startup.nix) { inherit lib pkgs; };
|
|
||||||
style = import (configPath + /style.nix) { inherit flake; };
|
|
||||||
windowrules = import (configPath + /windowrules.nix) { inherit workspaceStrings; };
|
|
||||||
workspaces = import (configPath + /workspaces.nix) { inherit workspaceStrings; };
|
|
||||||
in
|
|
||||||
binds // layout // main // outputs // startup // style // windowrules // workspaces;
|
|
||||||
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
programs.niri = {
|
# environment = {
|
||||||
settings = configImports;
|
# QT_QPA_PLATFORM = "wayland";
|
||||||
|
# DISPLAY = null;
|
||||||
|
# };
|
||||||
|
|
||||||
|
prefer-no-csd = true;
|
||||||
|
|
||||||
|
cursor = {
|
||||||
|
size = cursor.size;
|
||||||
|
theme = "catppuccin-macchiato-dark-cursors";
|
||||||
|
};
|
||||||
|
input = {
|
||||||
|
focus-follows-mouse.enable = true;
|
||||||
|
mouse.accel-profile = "flat";
|
||||||
|
};
|
||||||
|
|
||||||
|
spawn-at-startup = [
|
||||||
|
# { command = [ "xwayland-satellite" ]; }
|
||||||
|
{ command = [ "wl-clipboard" ]; }
|
||||||
|
{ command = [ "wpaperd" ]; }
|
||||||
|
{ command = [ "gammastep" ]; }
|
||||||
|
{ command = [ "dunst" ]; }
|
||||||
|
{ command = [ "playerctld" ]; }
|
||||||
|
{ command = [ "waybar" ]; }
|
||||||
|
{ command = [ "nm-applet" ]; }
|
||||||
|
{ command = [ "blueman-applet" ]; }
|
||||||
|
{ command = [ "rfkill block bluetooth" ]; }
|
||||||
|
{ command = [ "rfkill unblock bluetooth" ]; }
|
||||||
|
{ command = [ "easyeffects -r" ]; }
|
||||||
|
{ command = [ "vesktop" ]; }
|
||||||
|
{ command = [ "signal" ]; }
|
||||||
|
{ command = [ "feishin" ]; }
|
||||||
|
{ command = [ "zeditor" ]; }
|
||||||
|
];
|
||||||
|
|
||||||
|
animations = {
|
||||||
|
enable = true;
|
||||||
|
config-notification-open-close = {
|
||||||
|
spring = {
|
||||||
|
damping-ratio = 0.600000;
|
||||||
|
epsilon = 0.001000;
|
||||||
|
stiffness = 1000;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
horizontal-view-movement = {
|
||||||
|
spring = {
|
||||||
|
damping-ratio = 1.000000;
|
||||||
|
epsilon = 0.000100;
|
||||||
|
stiffness = 800;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
window-close = {
|
||||||
|
easing = {
|
||||||
|
curve = "ease-out-quad";
|
||||||
|
duration-ms = 150;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
window-open = {
|
||||||
|
spring = {
|
||||||
|
damping-ratio = 1.000000;
|
||||||
|
epsilon = 0.000100;
|
||||||
|
stiffness = 800;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
window-resize = {
|
||||||
|
spring = {
|
||||||
|
damping-ratio = 1.000000;
|
||||||
|
epsilon = 0.000100;
|
||||||
|
stiffness = 800;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
workspace-switch = {
|
||||||
|
spring = {
|
||||||
|
damping-ratio = 1.000000;
|
||||||
|
epsilon = 0.000100;
|
||||||
|
stiffness = 1000;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
binds = {
|
||||||
|
"Super+z".action = niri.spawn "obsidian";
|
||||||
|
"Super+l".action = niri.spawn "slack";
|
||||||
|
"Super+h".action = niri.spawn "feishin";
|
||||||
|
"Super+g".action = niri.spawn "scrcpy";
|
||||||
|
"Super+k".action = niri.spawn "ghostty -e nu -e y";
|
||||||
|
"Super+s".action = niri.spawn "steam";
|
||||||
|
"Super+r".action = niri.spawn "ghostty -e zellij a dotfiles";
|
||||||
|
"Super+n".action = niri.spawn "signal-desktop";
|
||||||
|
"Super+t".action = niri.spawn "zeditor";
|
||||||
|
"Super+b".action = niri.spawn "floorp";
|
||||||
|
"Super+x".action = niri.spawn "freetube";
|
||||||
|
"Super+v".action = niri.spawn "vesktop";
|
||||||
|
"Super+m".action = niri.spawn "element-desktop";
|
||||||
|
"Super+d".action = niri.spawn "ghostty";
|
||||||
|
"Super+p".action = niri.spawn "bitwarden";
|
||||||
|
"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+f".action = niri.swap-window-left;
|
||||||
|
"Super+o".action = niri.swap-window-right;
|
||||||
|
|
||||||
|
# "Ctrl+Alt+1".action = niri.move-window-to-workspace workspace0;
|
||||||
|
# "Ctrl+Alt+2".action = niri.move-window-to-workspace workspace1;
|
||||||
|
# "Ctrl+Alt+3".action = niri.move-window-to-workspace workspace2;
|
||||||
|
# "Ctrl+Alt+4".action = niri.move-window-to-workspace workspace3;
|
||||||
|
# "Ctrl+Alt+5".action = niri.move-window-to-workspace workspace4;
|
||||||
|
# "Super+Enter".action = niri.toggle-overview;
|
||||||
|
|
||||||
|
"Super+w".action = niri.switch-preset-column-width;
|
||||||
|
|
||||||
|
"Super+1".action = niri.focus-workspace workspace0;
|
||||||
|
"Super+4".action = niri.focus-workspace workspace1;
|
||||||
|
"Super+3".action = niri.focus-workspace workspace2;
|
||||||
|
"Super+2".action = niri.focus-workspace workspace3;
|
||||||
|
"Super+5".action = niri.focus-workspace workspace4;
|
||||||
|
|
||||||
|
"Super+c".action = niri.focus-column-or-monitor-left;
|
||||||
|
"Super+a".action = niri.focus-window-or-workspace-up;
|
||||||
|
"Super+e".action = niri.focus-window-or-workspace-down;
|
||||||
|
"Super+i".action = niri.focus-column-or-monitor-right;
|
||||||
|
|
||||||
|
"Super+Shift+t".action = niri.spawn "ghostty";
|
||||||
|
"Super+Shift+s".action = niri.spawn "flameshot gui";
|
||||||
|
"Super+Shift+period".action = niri.spawn "emote";
|
||||||
|
"Super+Shift+Tab".action = niri.fullscreen-window;
|
||||||
|
|
||||||
|
"Ctrl+Alt+c".action = niri.move-column-left;
|
||||||
|
"Ctrl+Alt+i".action = niri.move-column-right;
|
||||||
|
"Ctrl+Alt+f".action = niri.set-column-width "-10%";
|
||||||
|
"Ctrl+Alt+o".action = niri.set-column-width "+10%";
|
||||||
|
};
|
||||||
|
|
||||||
|
hotkey-overlay.skip-at-startup = true;
|
||||||
|
|
||||||
|
outputs = {
|
||||||
|
"DP-1" = {
|
||||||
|
background-color = makeColour el.base02;
|
||||||
|
scale = 1.0;
|
||||||
|
mode = {
|
||||||
|
width = 2560;
|
||||||
|
height = 1080;
|
||||||
|
refresh = 199.92;
|
||||||
|
};
|
||||||
|
position = {
|
||||||
|
x = 0;
|
||||||
|
y = 0;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
window-rules = [
|
||||||
|
{
|
||||||
|
open-focused = true;
|
||||||
|
}
|
||||||
|
{
|
||||||
|
matches =
|
||||||
|
let
|
||||||
|
windowMatch = c: {
|
||||||
|
app-id = c;
|
||||||
|
is-floating = true;
|
||||||
|
is-focused = true;
|
||||||
|
};
|
||||||
|
appIDs = [
|
||||||
|
".blueman-manager-wrapped"
|
||||||
|
"org.gnome.Calculator"
|
||||||
|
"com.github.wwmm.easyeffects"
|
||||||
|
"emote"
|
||||||
|
"mpv"
|
||||||
|
"vlc"
|
||||||
|
"org.nomacs.ImageLounge"
|
||||||
|
"flameshot"
|
||||||
|
"^.protonvpn-app-wrapped$"
|
||||||
|
"^Picture-in-Picture$"
|
||||||
|
"^Discord Popout$"
|
||||||
|
"^Enter name of file to save to…$"
|
||||||
|
"^File Upload$"
|
||||||
|
".scrcpy-wrapped"
|
||||||
|
"^Battle.net$"
|
||||||
|
];
|
||||||
|
in
|
||||||
|
builtins.map windowMatch appIDs;
|
||||||
|
}
|
||||||
|
{
|
||||||
|
matches =
|
||||||
|
let
|
||||||
|
windowMatch = c: {
|
||||||
|
app-id = c;
|
||||||
|
};
|
||||||
|
appIDs = [
|
||||||
|
"floop"
|
||||||
|
"org.kde.kdenlive"
|
||||||
|
"krita"
|
||||||
|
"mpv"
|
||||||
|
"vlc"
|
||||||
|
"Brave-browser"
|
||||||
|
"org.kde.okular"
|
||||||
|
];
|
||||||
|
in
|
||||||
|
builtins.map windowMatch appIDs;
|
||||||
|
opacity = 1.0;
|
||||||
|
}
|
||||||
|
{
|
||||||
|
matches =
|
||||||
|
let
|
||||||
|
windowMatch = c: {
|
||||||
|
app-id = c;
|
||||||
|
};
|
||||||
|
appIDs = [
|
||||||
|
"signal"
|
||||||
|
"vesktop"
|
||||||
|
];
|
||||||
|
in
|
||||||
|
builtins.map windowMatch appIDs;
|
||||||
|
open-on-workspace = workspace0;
|
||||||
|
}
|
||||||
|
{
|
||||||
|
matches =
|
||||||
|
let
|
||||||
|
windowMatch = c: {
|
||||||
|
app-id = c;
|
||||||
|
};
|
||||||
|
appIDs = [
|
||||||
|
"code"
|
||||||
|
"zeditor"
|
||||||
|
];
|
||||||
|
in
|
||||||
|
builtins.map windowMatch appIDs;
|
||||||
|
open-on-workspace = workspace1;
|
||||||
|
}
|
||||||
|
{
|
||||||
|
matches =
|
||||||
|
let
|
||||||
|
windowMatch = c: {
|
||||||
|
app-id = c;
|
||||||
|
};
|
||||||
|
appIDs = [
|
||||||
|
"steam"
|
||||||
|
"org.kde.kdenlive"
|
||||||
|
];
|
||||||
|
in
|
||||||
|
builtins.map windowMatch appIDs;
|
||||||
|
open-on-workspace = workspace2;
|
||||||
|
}
|
||||||
|
{
|
||||||
|
matches =
|
||||||
|
let
|
||||||
|
windowMatch = c: {
|
||||||
|
app-id = c;
|
||||||
|
};
|
||||||
|
appIDs = [
|
||||||
|
"feishin"
|
||||||
|
".scrcpy-wrapped"
|
||||||
|
];
|
||||||
|
in
|
||||||
|
builtins.map windowMatch appIDs;
|
||||||
|
open-on-workspace = workspace3;
|
||||||
|
}
|
||||||
|
{
|
||||||
|
# opacity = 0.90;
|
||||||
|
clip-to-geometry = true;
|
||||||
|
focus-ring.enable = false;
|
||||||
|
geometry-corner-radius =
|
||||||
|
let
|
||||||
|
radius = 10.0;
|
||||||
|
in
|
||||||
|
{
|
||||||
|
top-left = radius;
|
||||||
|
top-right = radius;
|
||||||
|
bottom-left = radius;
|
||||||
|
bottom-right = radius;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
];
|
||||||
|
|
||||||
|
layout = {
|
||||||
|
default-column-width = {
|
||||||
|
proportion = 1.;
|
||||||
|
};
|
||||||
|
preset-column-widths = [
|
||||||
|
{ proportion = 1. / 3.; }
|
||||||
|
{ proportion = 1. / 2.; }
|
||||||
|
{ proportion = 2. / 3.; }
|
||||||
|
{ proportion = 1.; }
|
||||||
|
];
|
||||||
|
border = {
|
||||||
|
enable = true;
|
||||||
|
width = 2;
|
||||||
|
active.color = makeColour el.base0E;
|
||||||
|
inactive.color = makeColour el.base02;
|
||||||
|
};
|
||||||
|
gaps = 5;
|
||||||
|
shadow = {
|
||||||
|
enable = true;
|
||||||
|
color = el.base11;
|
||||||
|
draw-behind-window = true;
|
||||||
|
offset.x = 0;
|
||||||
|
offset.y = 0;
|
||||||
|
spread = 3;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
workspaces = {
|
||||||
|
${workspace0} = {
|
||||||
|
name = workspace0;
|
||||||
|
};
|
||||||
|
${workspace1} = {
|
||||||
|
name = workspace1;
|
||||||
|
};
|
||||||
|
${workspace2} = {
|
||||||
|
name = workspace2;
|
||||||
|
};
|
||||||
|
${workspace3} = {
|
||||||
|
name = workspace3;
|
||||||
|
};
|
||||||
|
${workspace4} = {
|
||||||
|
name = workspace4;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
# home.packages = builtins.attrValues {
|
||||||
|
# inherit (pkgs)
|
||||||
|
# xwayland-satellite
|
||||||
|
# ;
|
||||||
|
# };
|
||||||
|
}
|
||||||
|
|
|
||||||
0
modules/home/gui/desktop/wayland/printManager/default.nix
Executable file → Normal file
0
modules/home/gui/desktop/wayland/printManager/default.nix
Executable file → Normal file
|
|
@ -44,7 +44,6 @@ in
|
||||||
sddm
|
sddm
|
||||||
flatpak
|
flatpak
|
||||||
xserver
|
xserver
|
||||||
espanso
|
|
||||||
wireGuard
|
wireGuard
|
||||||
;
|
;
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -10,10 +10,7 @@
|
||||||
|
|
||||||
environment.sessionVariables.COSMIC_DATA_CONTROL_ENABLED = 1;
|
environment.sessionVariables.COSMIC_DATA_CONTROL_ENABLED = 1;
|
||||||
services = {
|
services = {
|
||||||
desktopManager.cosmic = {
|
desktopManager.cosmic.enable = true;
|
||||||
enable = true;
|
displayManager.cosmic-greeter.enable = true;
|
||||||
xwayland.enable = true;
|
|
||||||
};
|
|
||||||
# displayManager.cosmic-greeter.enable = true;
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -22,4 +22,5 @@ in
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,7 +0,0 @@
|
||||||
{ pkgs, ... }:
|
|
||||||
{
|
|
||||||
services.espanso = {
|
|
||||||
package = pkgs.espanso-wayland;
|
|
||||||
enable = true;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue