Compare commits
8 Commits
ced43bf7eb
...
ef76c91365
| Author | SHA1 | Date | |
|---|---|---|---|
| ef76c91365 | |||
| ddf57f8c37 | |||
| ac4bd81a63 | |||
| 21407383dc | |||
| f810a5e4fc | |||
| 3b8fbacf70 | |||
| b21320ce2a | |||
| 620bb5c70a |
427
flake.lock
generated
427
flake.lock
generated
@ -20,11 +20,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1741282631,
|
||||
"narHash": "sha256-jZE1CmQ53uN1Gq4FjaLFzSSjDqzL0pG4mdRbjBqSmho=",
|
||||
"lastModified": 1742213273,
|
||||
"narHash": "sha256-0l0vDb4anfsBu1rOs94bC73Hub+xEivgBAo6QXl2MmU=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "aquamarine",
|
||||
"rev": "81498562d0f53e613d30368bb5b076784fa86f80",
|
||||
"rev": "484b732195cc53f4536ce4bd59a5c6402b1e7ccf",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -108,11 +108,11 @@
|
||||
"systems": "systems"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1741365449,
|
||||
"narHash": "sha256-4bmMbrmc6p6QxmF0Frc6SoZUfaodWcxjqEgw5mGmTAQ=",
|
||||
"lastModified": 1742376042,
|
||||
"narHash": "sha256-sh09UPmrumfAEMeo50JLhGEkN/4FmEA6ad2KV5HXcos=",
|
||||
"owner": "numtide",
|
||||
"repo": "blueprint",
|
||||
"rev": "09a2c2c7bb08e5baeb88319e042ccfe6acaa9664",
|
||||
"rev": "33e0f1c491e9f4c446e142f8b9edd23be43d188a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -121,6 +121,24 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"catppuccin": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1742254251,
|
||||
"narHash": "sha256-3wGCx5UR86pgurSYB//LsBMKAsw6qpiOpnzgShPQKkM=",
|
||||
"owner": "catppuccin",
|
||||
"repo": "nix",
|
||||
"rev": "4cb9c621072312fb45c6e86b57e5fabd97f1b95d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "catppuccin",
|
||||
"repo": "nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"chaotic": {
|
||||
"inputs": {
|
||||
"fenix": "fenix",
|
||||
@ -132,11 +150,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1741608455,
|
||||
"narHash": "sha256-LksubGjahffnZH3+56NccCb4qAHcA7e69Njy4X1D5Fg=",
|
||||
"lastModified": 1742347728,
|
||||
"narHash": "sha256-wpAF+eNdPN21hwVirBXSsRDeWtTflkhsZL5zhGy6uB8=",
|
||||
"owner": "chaotic-cx",
|
||||
"repo": "nyx",
|
||||
"rev": "c6dea73cebfaad0e41d56d40f7726289d10e1757",
|
||||
"rev": "f8371934a154aad05f0f8f3f6ddaccb00f1b91e8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -176,11 +194,11 @@
|
||||
"rust-analyzer-src": "rust-analyzer-src"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1741329193,
|
||||
"narHash": "sha256-niB60+AZBnp535cwvu5jU+K/cKfJeaWqt3GtrDMlLU0=",
|
||||
"lastModified": 1742279664,
|
||||
"narHash": "sha256-K/gD8271/eRjwks4EX1fLHCjb4UzdUqDCGdwNh4TwIw=",
|
||||
"owner": "nix-community",
|
||||
"repo": "fenix",
|
||||
"rev": "232581de4261157f316848773574d1f5895805f3",
|
||||
"rev": "193dcb4e6edb3ba927f4d88b8b1fe65b9e5368c3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -192,11 +210,11 @@
|
||||
"firefox-gnome-theme": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1739223196,
|
||||
"narHash": "sha256-vAxN2f3rvl5q62gQQjZGVSvF93nAsOxntuFz+e/655w=",
|
||||
"lastModified": 1741628778,
|
||||
"narHash": "sha256-RsvHGNTmO2e/eVfgYK7g+eYEdwwh7SbZa+gZkT24MEA=",
|
||||
"owner": "rafaelmardojai",
|
||||
"repo": "firefox-gnome-theme",
|
||||
"rev": "a89108e6272426f4eddd93ba17d0ea101c34fb21",
|
||||
"rev": "5a81d390bb64afd4e81221749ec4bffcbeb5fa80",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -253,27 +271,6 @@
|
||||
}
|
||||
},
|
||||
"flake-parts": {
|
||||
"inputs": {
|
||||
"nixpkgs-lib": [
|
||||
"nixvim",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1738453229,
|
||||
"narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-parts_2": {
|
||||
"inputs": {
|
||||
"nixpkgs-lib": [
|
||||
"stylix",
|
||||
@ -328,42 +325,6 @@
|
||||
}
|
||||
},
|
||||
"flake-utils_2": {
|
||||
"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_3": {
|
||||
"inputs": {
|
||||
"systems": "systems_6"
|
||||
},
|
||||
"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": {
|
||||
"systems": [
|
||||
"stylix",
|
||||
@ -428,11 +389,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1737465171,
|
||||
"narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=",
|
||||
"lastModified": 1741379162,
|
||||
"narHash": "sha256-srpAbmJapkaqGRE3ytf3bj4XshspVR5964OX5LfjDWc=",
|
||||
"owner": "cachix",
|
||||
"repo": "git-hooks.nix",
|
||||
"rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17",
|
||||
"rev": "b5a62751225b2f62ff3147d0a334055ebadcd5cc",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -510,11 +471,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1741393072,
|
||||
"narHash": "sha256-+Su28oU1FBvptj1AO0geJP+BcIJghSVxaNFagvW5K2M=",
|
||||
"lastModified": 1742326330,
|
||||
"narHash": "sha256-Tumt3tcMXJniSh7tw2gW+WAnVLeB3WWm+E+yYFnLBXo=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "d2c014e1c73195d1958abec0c5ca6112b07b79da",
|
||||
"rev": "22a36aa709de7dd42b562a433b9cefecf104a6ee",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -530,11 +491,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1741613526,
|
||||
"narHash": "sha256-HUEfRLqCy47BQ7kOG4SRVhqE7J6lkFzAagnd13I17qk=",
|
||||
"lastModified": 1742326330,
|
||||
"narHash": "sha256-Tumt3tcMXJniSh7tw2gW+WAnVLeB3WWm+E+yYFnLBXo=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "3593ee59a44974b8518829a5239b2f77222e3c81",
|
||||
"rev": "22a36aa709de7dd42b562a433b9cefecf104a6ee",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -551,11 +512,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1740347597,
|
||||
"narHash": "sha256-st5q9egkPGz8TUcVVlIQX7y6G3AzHob+6M963bwVq74=",
|
||||
"lastModified": 1741635347,
|
||||
"narHash": "sha256-2aYfV44h18alHXopyfL4D9GsnpE5XlSVkp4MGe586VU=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "12e26a74e5eb1a31e13daaa08858689e25ebd449",
|
||||
"rev": "7fb8678716c158642ac42f9ff7a18c0800fea551",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -580,11 +541,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1738664950,
|
||||
"narHash": "sha256-xIeGNM+iivwVHkv9tHwOqoUP5dDrtees34bbFKKMZYs=",
|
||||
"lastModified": 1742215578,
|
||||
"narHash": "sha256-zfs71PXVVPEe56WEyNi2TJQPs0wabU4WAlq0XV7GcdE=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprcursor",
|
||||
"rev": "7c6d165e1eb9045a996551eb9f121b6d1b30adc3",
|
||||
"rev": "2fd36421c21aa87e2fe3bee11067540ae612f719",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -640,11 +601,11 @@
|
||||
"xdph": "xdph"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1741461862,
|
||||
"narHash": "sha256-TNTtpDHoNB+wOEfypkGTu2zC0wHUwbabQo4HyU53Yok=",
|
||||
"lastModified": 1742341588,
|
||||
"narHash": "sha256-IlkAyfErpnTEUpjGhECfGp3t3HgF8KHBrJquOCdjp3M=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "Hyprland",
|
||||
"rev": "d30cc19d253a3db784ad10c3084f58cbb52d325a",
|
||||
"rev": "c8d80a292012f036e1a1d3eb3b0501e3e3917872",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -817,11 +778,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1741123584,
|
||||
"narHash": "sha256-mprerMlucqtirmbx6L3VoFnF2bGYc2WSUCj7tuc6xTQ=",
|
||||
"lastModified": 1741534688,
|
||||
"narHash": "sha256-EV3945SnjOCuRVbGRghsWx/9D89FyshnSO1Q6/TuQ14=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprutils",
|
||||
"rev": "6b0154b183f9539097f13af9b5da78ca24da6df2",
|
||||
"rev": "dd1f720cbc2dbb3c71167c9598045dd3261d27b3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -880,34 +841,6 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"ixx": {
|
||||
"inputs": {
|
||||
"flake-utils": [
|
||||
"nixvim",
|
||||
"nuschtosSearch",
|
||||
"flake-utils"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"nixvim",
|
||||
"nuschtosSearch",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1729958008,
|
||||
"narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=",
|
||||
"owner": "NuschtOS",
|
||||
"repo": "ixx",
|
||||
"rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NuschtOS",
|
||||
"ref": "v0.0.6",
|
||||
"repo": "ixx",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"jovian": {
|
||||
"inputs": {
|
||||
"nix-github-actions": "nix-github-actions",
|
||||
@ -917,11 +850,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1741338475,
|
||||
"narHash": "sha256-+vAXiFRQ6ykBX7iFI20rV+xMyOVNtULbFWy6BHKPP+0=",
|
||||
"lastModified": 1742278596,
|
||||
"narHash": "sha256-ZShdL237Hz+Sog0mzfsCui+kyj+Xd2ka91Dilxlz9j4=",
|
||||
"owner": "Jovian-Experiments",
|
||||
"repo": "Jovian-NixOS",
|
||||
"rev": "1821e6ae980ff6175d28065ad6d0c87560d2b8ea",
|
||||
"rev": "fd69a59cfab06fe8ac0695377e10573e91b6a3ff",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -940,29 +873,29 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1737237494,
|
||||
"narHash": "sha256-YMLrcBpf0TR5r/eaqm8lxzFPap2TxCor0ZGcK3a7+b8=",
|
||||
"rev": "b90bf629bbd835e61f1317b99e12f8c831017006",
|
||||
"lastModified": 1741892773,
|
||||
"narHash": "sha256-8oUT6D7VlsuLkms3zBsUaPBUoxucmFq62QdtyVpjq0Y=",
|
||||
"rev": "ed7a2fa83145868ecb830d6b3c73ebfd81a9e911",
|
||||
"type": "tarball",
|
||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/b90bf629bbd835e61f1317b99e12f8c831017006.tar.gz?rev=b90bf629bbd835e61f1317b99e12f8c831017006"
|
||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/ed7a2fa83145868ecb830d6b3c73ebfd81a9e911.tar.gz?rev=ed7a2fa83145868ecb830d6b3c73ebfd81a9e911"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
"url": "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0.tar.gz"
|
||||
"url": "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0-1.tar.gz"
|
||||
}
|
||||
},
|
||||
"lix_2": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1737234286,
|
||||
"narHash": "sha256-CCKIAE84dzkrnlxJCKFyffAxP3yfsOAbdvydUGqq24g=",
|
||||
"rev": "2837da71ec1588c1187d2e554719b15904a46c8b",
|
||||
"narHash": "sha256-pgDJZjj4jpzkFxsqBTI/9Yb0n3gW+DvDtuv9SwQZZcs=",
|
||||
"rev": "079528098f5998ba13c88821a2eca1005c1695de",
|
||||
"type": "tarball",
|
||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/2837da71ec1588c1187d2e554719b15904a46c8b.tar.gz?rev=2837da71ec1588c1187d2e554719b15904a46c8b"
|
||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/079528098f5998ba13c88821a2eca1005c1695de.tar.gz?rev=079528098f5998ba13c88821a2eca1005c1695de"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
"url": "https://git.lix.systems/lix-project/lix/archive/2.92.0.tar.gz"
|
||||
"url": "https://git.lix.systems/lix-project/lix/archive/release-2.92.tar.gz"
|
||||
}
|
||||
},
|
||||
"mysecrets": {
|
||||
@ -981,12 +914,15 @@
|
||||
"url": "ssh://gitea@gitea.linerds.us/unexplrd/nix-secrets"
|
||||
}
|
||||
},
|
||||
<<<<<<< Conflict 1 of 6
|
||||
%%%%%%% Changes from base to side #1
|
||||
"neve": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils_2",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
- "nixpkgs": "nixpkgs",
|
||||
+ "nixpkgs": [
|
||||
+ "nixpkgs"
|
||||
+ ],
|
||||
"nixvim": [
|
||||
"nixvim"
|
||||
]
|
||||
@ -1005,13 +941,15 @@
|
||||
"url": "https://gitea.linerds.us/unexplrd/Neve"
|
||||
}
|
||||
},
|
||||
+++++++ Contents of side #2
|
||||
>>>>>>> Conflict 1 of 6 ends
|
||||
"nix-flatpak": {
|
||||
"locked": {
|
||||
"lastModified": 1739444422,
|
||||
"narHash": "sha256-iAVVHi7X3kWORftY+LVbRiStRnQEob2TULWyjMS6dWg=",
|
||||
"lastModified": 1741903049,
|
||||
"narHash": "sha256-8Y8brH04JjSLrCLvBEbhK9vOu7lhQhqUBW4kI3tifdI=",
|
||||
"owner": "gmodena",
|
||||
"repo": "nix-flatpak",
|
||||
"rev": "5e54c3ca05a7c7d968ae1ddeabe01d2a9bc1e177",
|
||||
"rev": "42c7fb2702219b86a8f5969c3475ce594c28f5d0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1050,11 +988,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1741619381,
|
||||
"narHash": "sha256-koZtlJRqi0/MD/AKd0KrXLA2NuBOVzlIyAJprjzpxZE=",
|
||||
"lastModified": 1742174123,
|
||||
"narHash": "sha256-pDNzMoR6m1ZSJToZQ6XDTLVSdzIzmFl1b8Pc3f7iV6Y=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-index-database",
|
||||
"rev": "66537fb185462ba9b07f4e6f2d54894a1b2d04ab",
|
||||
"rev": "2cfb4e1ca32f59dd2811d7a6dd5d4d1225f0955c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1070,11 +1008,11 @@
|
||||
"nixpkgs-stable": "nixpkgs-stable"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1741609568,
|
||||
"narHash": "sha256-kJwImKYJq9djZ13l5lSEdqfB/Y+h43LTqUPjz5wZOec=",
|
||||
"lastModified": 1742351419,
|
||||
"narHash": "sha256-IC3jdMFJtLnwnjNyCeQ1o9Y8gEmDw5RQ7ZLIXf0u7fs=",
|
||||
"owner": "lilyinstarlight",
|
||||
"repo": "nixos-cosmic",
|
||||
"rev": "f34eb24fb96780df1437a201948df785d77b3b8a",
|
||||
"rev": "55c7223b2c739b4d948a4a84a8150cedcb779e53",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1085,12 +1023,25 @@
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1741379970,
|
||||
<<<<<<< Conflict 2 of 6
|
||||
%%%%%%% Changes from base to side #1
|
||||
- "lastModified": 0,
|
||||
+ "lastModified": 1741379970,
|
||||
"narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=",
|
||||
- "path": "/nix/store/pqgpwakx0m4r75zg34954w5mwi5shg89-source",
|
||||
- "type": "path"
|
||||
+ "owner": "NixOS",
|
||||
+ "repo": "nixpkgs",
|
||||
+ "rev": "36fd87baa9083f34f7f5027900b62ee6d09b1f2f",
|
||||
+ "type": "github"
|
||||
+++++++ Contents of side #2
|
||||
"lastModified": 1741851582,
|
||||
"narHash": "sha256-cPfs8qMccim2RBgtKGF+x9IBCduRvd/N5F4nYpU0TVE=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "36fd87baa9083f34f7f5027900b62ee6d09b1f2f",
|
||||
"rev": "6607cf789e541e7873d40d3a8f7815ea92204f32",
|
||||
"type": "github"
|
||||
>>>>>>> Conflict 2 of 6 ends
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
@ -1101,11 +1052,11 @@
|
||||
},
|
||||
"nixpkgs-stable": {
|
||||
"locked": {
|
||||
"lastModified": 1741445498,
|
||||
"narHash": "sha256-F5Em0iv/CxkN5mZ9hRn3vPknpoWdcdCyR0e4WklHwiE=",
|
||||
"lastModified": 1742136038,
|
||||
"narHash": "sha256-DDe16FJk18sadknQKKG/9FbwEro7A57tg9vB5kxZ8kY=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "52e3095f6d812b91b22fb7ad0bfc1ab416453634",
|
||||
"rev": "a1185f4064c18a5db37c5c84e5638c78b46e3341",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1117,11 +1068,11 @@
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1741379970,
|
||||
"narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=",
|
||||
"lastModified": 1742069588,
|
||||
"narHash": "sha256-C7jVfohcGzdZRF6DO+ybyG/sqpo1h6bZi9T56sxLy+k=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "36fd87baa9083f34f7f5027900b62ee6d09b1f2f",
|
||||
"rev": "c80f6a7e10b39afcc1894e02ef785b1ad0b0d7e5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1133,6 +1084,24 @@
|
||||
},
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
<<<<<<< Conflict 3 of 6
|
||||
%%%%%%% Changes from base to side #1
|
||||
- "lastModified": 1741379970,
|
||||
- "narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=",
|
||||
- "owner": "NixOS",
|
||||
- "repo": "nixpkgs",
|
||||
- "rev": "36fd87baa9083f34f7f5027900b62ee6d09b1f2f",
|
||||
- "type": "github"
|
||||
- },
|
||||
- "original": {
|
||||
- "owner": "NixOS",
|
||||
- "ref": "nixos-unstable",
|
||||
- "repo": "nixpkgs",
|
||||
- "type": "github"
|
||||
- }
|
||||
- },
|
||||
- "nixpkgs_4": {
|
||||
- "locked": {
|
||||
"lastModified": 1738797219,
|
||||
"narHash": "sha256-KRwX9Z1XavpgeSDVM/THdFd6uH8rNm/6R+7kIbGa+2s=",
|
||||
"owner": "NixOS",
|
||||
@ -1147,13 +1116,20 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_4": {
|
||||
- "nixpkgs_5": {
|
||||
+ "nixpkgs_4": {
|
||||
"locked": {
|
||||
"lastModified": 1740367490,
|
||||
"narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "0196c0175e9191c474c26ab5548db27ef5d34b05",
|
||||
+++++++ Contents of side #2
|
||||
"lastModified": 1742288794,
|
||||
"narHash": "sha256-Txwa5uO+qpQXrNG4eumPSD+hHzzYi/CdaM80M9XRLCo=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "b6eaf97c6960d97350c584de1b6dcff03c9daf42",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1163,10 +1139,30 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixvim": {
|
||||
"nixpkgs_4": {
|
||||
"locked": {
|
||||
"lastModified": 1741513245,
|
||||
"narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1",
|
||||
>>>>>>> Conflict 3 of 6 ends
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nur": {
|
||||
"inputs": {
|
||||
"flake-parts": "flake-parts",
|
||||
"nixpkgs": "nixpkgs_3",
|
||||
<<<<<<< Conflict 4 of 6
|
||||
%%%%%%% Changes from base to side #1
|
||||
- "nixpkgs": "nixpkgs_4",
|
||||
+ "nixpkgs": "nixpkgs_3",
|
||||
"nuschtosSearch": "nuschtosSearch"
|
||||
},
|
||||
"locked": {
|
||||
@ -1186,6 +1182,8 @@
|
||||
"nur": {
|
||||
"inputs": {
|
||||
"flake-parts": "flake-parts_2",
|
||||
+++++++ Contents of side #2
|
||||
>>>>>>> Conflict 4 of 6 ends
|
||||
"nixpkgs": [
|
||||
"stylix",
|
||||
"nixpkgs"
|
||||
@ -1193,11 +1191,11 @@
|
||||
"treefmt-nix": "treefmt-nix"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1740408283,
|
||||
"narHash": "sha256-2xECnhgF3MU9YjmvOkrRp8wRFo2OjjewgCtlfckhL5s=",
|
||||
"lastModified": 1741693509,
|
||||
"narHash": "sha256-emkxnsZstiJWmGACimyAYqIKz2Qz5We5h1oBVDyQjLw=",
|
||||
"owner": "nix-community",
|
||||
"repo": "NUR",
|
||||
"rev": "496a4a11162bdffb9a7b258942de138873f019f7",
|
||||
"rev": "5479646b2574837f1899da78bdf9a48b75a9fb27",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1206,29 +1204,6 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nuschtosSearch": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils_3",
|
||||
"ixx": "ixx",
|
||||
"nixpkgs": [
|
||||
"nixvim",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1738508923,
|
||||
"narHash": "sha256-4DaDrQDAIxlWhTjH6h/+xfG05jt3qDZrZE/7zDLQaS4=",
|
||||
"owner": "NuschtOS",
|
||||
"repo": "search",
|
||||
"rev": "86e2038290859006e05ca7201425ea5b5de4aecb",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NuschtOS",
|
||||
"repo": "search",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"pre-commit-hooks": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat",
|
||||
@ -1239,11 +1214,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1741379162,
|
||||
"narHash": "sha256-srpAbmJapkaqGRE3ytf3bj4XshspVR5964OX5LfjDWc=",
|
||||
"lastModified": 1742058297,
|
||||
"narHash": "sha256-b4SZc6TkKw8WQQssbN5O2DaCEzmFfvSTPYHlx/SFW9Y=",
|
||||
"owner": "cachix",
|
||||
"repo": "git-hooks.nix",
|
||||
"rev": "b5a62751225b2f62ff3147d0a334055ebadcd5cc",
|
||||
"rev": "59f17850021620cd348ad2e9c0c64f4e6325ce2a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1255,6 +1230,7 @@
|
||||
"root": {
|
||||
"inputs": {
|
||||
"blueprint": "blueprint",
|
||||
"catppuccin": "catppuccin",
|
||||
"chaotic": "chaotic",
|
||||
"disko": "disko",
|
||||
"home-manager": "home-manager_2",
|
||||
@ -1262,12 +1238,17 @@
|
||||
"hyprsunset": "hyprsunset",
|
||||
"lix": "lix",
|
||||
"mysecrets": "mysecrets",
|
||||
"neve": "neve",
|
||||
"nix-flatpak": "nix-flatpak",
|
||||
"nix-index-database": "nix-index-database",
|
||||
"nixos-cosmic": "nixos-cosmic",
|
||||
<<<<<<< Conflict 5 of 6
|
||||
+++++++ Contents of side #1
|
||||
"nixpkgs": "nixpkgs_2",
|
||||
"nixvim": "nixvim",
|
||||
%%%%%%% Changes from base to side #2
|
||||
"nixpkgs": "nixpkgs_3",
|
||||
- "nixvim": "nixvim",
|
||||
>>>>>>> Conflict 5 of 6 ends
|
||||
"sops-nix": "sops-nix",
|
||||
"stylix": "stylix",
|
||||
"walker": "walker"
|
||||
@ -1276,11 +1257,11 @@
|
||||
"rust-analyzer-src": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1741300343,
|
||||
"narHash": "sha256-Engmn908XKEy/hmriudPQbX1QWr7ySpmQg9HbTigiME=",
|
||||
"lastModified": 1742249107,
|
||||
"narHash": "sha256-3jVOcCZgXBvQ2HsjgHXmZow9/3d1K4oRwVyvhYfnvyg=",
|
||||
"owner": "rust-lang",
|
||||
"repo": "rust-analyzer",
|
||||
"rev": "21a88a3767c4a6b3f211ed12174b923be851e1c6",
|
||||
"rev": "31e412c290f6ff6de4548e94e187477f072b179e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1297,11 +1278,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1741043164,
|
||||
"narHash": "sha256-9lfmSZLz6eq9Ygr6cCmvQiiBEaPb54pUBcjvbEMPORc=",
|
||||
"lastModified": 1742239755,
|
||||
"narHash": "sha256-ptn8dR4Uat3UUadGYNnB7CIH9SQm8mK69D2A/twBUXQ=",
|
||||
"owner": "mic92",
|
||||
"repo": "sops-nix",
|
||||
"rev": "3f2412536eeece783f0d0ad3861417f347219f4d",
|
||||
"rev": "787afce414bcce803b605c510b60bf43c11f4b55",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1318,13 +1299,13 @@
|
||||
"base16-vim": "base16-vim",
|
||||
"firefox-gnome-theme": "firefox-gnome-theme",
|
||||
"flake-compat": "flake-compat_3",
|
||||
"flake-utils": "flake-utils_4",
|
||||
"flake-utils": "flake-utils_2",
|
||||
"git-hooks": "git-hooks",
|
||||
"gnome-shell": "gnome-shell",
|
||||
"home-manager": "home-manager_3",
|
||||
"nixpkgs": "nixpkgs_4",
|
||||
"nur": "nur",
|
||||
"systems": "systems_7",
|
||||
"systems": "systems_5",
|
||||
"tinted-foot": "tinted-foot",
|
||||
"tinted-kitty": "tinted-kitty",
|
||||
"tinted-schemes": "tinted-schemes",
|
||||
@ -1332,11 +1313,11 @@
|
||||
"tinted-zed": "tinted-zed"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1741622599,
|
||||
"narHash": "sha256-WIgJ3EniM/kQKgMlTEWMpFQ/5p62Vl+BwO6V2naAlWw=",
|
||||
"lastModified": 1742299802,
|
||||
"narHash": "sha256-enlpX8hwrfmjv/dHTKWzAB5Cwt1Kr6+ptikjX3Ob+FY=",
|
||||
"owner": "danth",
|
||||
"repo": "stylix",
|
||||
"rev": "9388f64ebe5d6bf99f35b67146f2aa0d765a12d0",
|
||||
"rev": "ff9ae322bcaeccabc65812390000276455331123",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1420,6 +1401,8 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
<<<<<<< Conflict 6 of 6
|
||||
%%%%%%% Changes from base to side #1
|
||||
"systems_6": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
@ -1450,21 +1433,23 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"systems_8": {
|
||||
"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_8": {
|
||||
+ "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"
|
||||
+ }
|
||||
+ },
|
||||
+++++++ Contents of side #2
|
||||
>>>>>>> Conflict 6 of 6 ends
|
||||
"tinted-foot": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
@ -1502,11 +1487,11 @@
|
||||
"tinted-schemes": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1740351358,
|
||||
"narHash": "sha256-Hdk850xgAd3DL8KX0AbyU7tC834d3Lej1jOo3duWiOA=",
|
||||
"lastModified": 1741468895,
|
||||
"narHash": "sha256-YKM1RJbL68Yp2vESBqeZQBjTETXo8mCTTzLZyckCfZk=",
|
||||
"owner": "tinted-theming",
|
||||
"repo": "schemes",
|
||||
"rev": "a1bc2bd89e693e7e3f5764cfe8114e2ae150e184",
|
||||
"rev": "47c8c7726e98069cade5827e5fb2bfee02ce6991",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1518,11 +1503,11 @@
|
||||
"tinted-tmux": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1740272597,
|
||||
"narHash": "sha256-/etfUV3HzAaLW3RSJVwUaW8ULbMn3v6wbTlXSKbcoWQ=",
|
||||
"lastModified": 1740877430,
|
||||
"narHash": "sha256-zWcCXgdC4/owfH/eEXx26y5BLzTrefjtSLFHWVD5KxU=",
|
||||
"owner": "tinted-theming",
|
||||
"repo": "tinted-tmux",
|
||||
"rev": "b6c7f46c8718cc484f2db8b485b06e2a98304cd0",
|
||||
"rev": "d48ee86394cbe45b112ba23ab63e33656090edb4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1618,11 +1603,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1737634991,
|
||||
"narHash": "sha256-dBAnb7Kbnier30cA7AgxVSxxARmxKZ1vHZT33THSIr8=",
|
||||
"lastModified": 1741934139,
|
||||
"narHash": "sha256-ZhTcTH9FoeAtbPfWGrhkH7RjLJZ7GeF18nygLAMR+WE=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "xdg-desktop-portal-hyprland",
|
||||
"rev": "e09dfe2726c8008f983e45a0aa1a3b7416aaeb8a",
|
||||
"rev": "150b0b6f52bb422a1b232a53698606fe0320dde0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
||||
@ -3,19 +3,20 @@
|
||||
|
||||
inputs = {
|
||||
blueprint.url = "github:numtide/blueprint";
|
||||
catppuccin.url = "github:catppuccin/nix";
|
||||
chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable";
|
||||
disko.url = "github:nix-community/disko/latest";
|
||||
home-manager.url = "github:nix-community/home-manager";
|
||||
hyprland.url = "github:hyprwm/Hyprland";
|
||||
hyprsunset.url = "github:hyprwm/hyprsunset";
|
||||
lix.url = "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0.tar.gz";
|
||||
lix.url = "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0-1.tar.gz";
|
||||
mysecrets.url = "git+ssh://gitea@gitea.linerds.us/unexplrd/nix-secrets";
|
||||
neve.url = "git+https://gitea.linerds.us/unexplrd/Neve";
|
||||
# neve.url = "git+https://gitea.linerds.us/unexplrd/Neve";
|
||||
nix-flatpak.url = "github:gmodena/nix-flatpak";
|
||||
nix-index-database.url = "github:nix-community/nix-index-database";
|
||||
nixos-cosmic.url = "github:lilyinstarlight/nixos-cosmic";
|
||||
nixpkgs.url = "github:NixOS/nixpkgs?ref=nixos-unstable";
|
||||
nixvim.url = "github:nix-community/nixvim";
|
||||
# nixvim.url = "github:nix-community/nixvim";
|
||||
sops-nix.url = "github:mic92/sops-nix";
|
||||
stylix.url = "github:danth/stylix";
|
||||
# TODO: somehow reduce the number of *.inputs.nixpkgs.follows = "nixpkgs" stuff, mb a function?
|
||||
@ -29,7 +30,7 @@
|
||||
hyprsunset.inputs.nixpkgs.follows = "nixpkgs";
|
||||
lix.inputs.nixpkgs.follows = "nixpkgs";
|
||||
mysecrets.flake = false;
|
||||
neve.inputs.nixvim.follows = "nixvim";
|
||||
# neve.inputs.nixvim.follows = "nixvim";
|
||||
nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
|
||||
sops-nix.inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
9
hosts/dunamis/catppuccin.nix
Normal file
9
hosts/dunamis/catppuccin.nix
Normal file
@ -0,0 +1,9 @@
|
||||
{inputs, ...}: {
|
||||
imports = with inputs; [
|
||||
catppuccin.nixosModules.catppuccin
|
||||
];
|
||||
catppuccin = {
|
||||
enable = true;
|
||||
flavor = "latte";
|
||||
};
|
||||
}
|
||||
@ -11,6 +11,8 @@
|
||||
./hardware.nix
|
||||
./programs.nix
|
||||
./stylix.nix
|
||||
# ./stylix-light.nix
|
||||
# ./catppuccin.nix
|
||||
./disko.nix
|
||||
./users.nix
|
||||
./sops.nix
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
];
|
||||
stylix = {
|
||||
enable = true;
|
||||
base16Scheme = "${pkgs.base16-schemes}/share/themes/tomorrow.yaml";
|
||||
base16Scheme = "${pkgs.base16-schemes}/share/themes/nord-light.yaml";
|
||||
polarity = "light";
|
||||
cursor = {
|
||||
package = pkgs.bibata-cursors;
|
||||
@ -20,9 +20,9 @@
|
||||
size = 24;
|
||||
};
|
||||
image = builtins.fetchurl {
|
||||
url = "https://w.wallhaven.cc/full/2y/wallhaven-2y7xv6.jpg";
|
||||
name = "wallhaven-2y7xv6.jpg";
|
||||
sha256 = "8c2118165298ff8f25138a2fed78e5f95e2494cfbf516b20ab1ff52dbad51afe";
|
||||
url = "https://w.wallhaven.cc/full/e7/wallhaven-e7djlk.png";
|
||||
name = "wallhaven-e7djlk.png";
|
||||
sha256 = "1mwvnmflp0z1biyyhfz7mjn7i1nna94n7jyns3na2shbfkaq7i0h";
|
||||
};
|
||||
opacity.terminal = 0.9;
|
||||
fonts = {
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
];
|
||||
stylix = {
|
||||
enable = true;
|
||||
base16Scheme = "${pkgs.base16-schemes}/share/themes/tomorrow-night.yaml";
|
||||
base16Scheme = "${pkgs.base16-schemes}/share/themes/nord.yaml";
|
||||
polarity = "dark";
|
||||
cursor = {
|
||||
package = pkgs.bibata-cursors;
|
||||
@ -20,9 +20,9 @@
|
||||
size = 24;
|
||||
};
|
||||
image = builtins.fetchurl {
|
||||
url = "https://w.wallhaven.cc/full/2y/wallhaven-2y7xv6.jpg";
|
||||
name = "wallhaven-2y7xv6.jpg";
|
||||
sha256 = "8c2118165298ff8f25138a2fed78e5f95e2494cfbf516b20ab1ff52dbad51afe";
|
||||
url = "https://w.wallhaven.cc/full/l8/wallhaven-l8l9gq.png";
|
||||
name = "wallhaven-l8l9gq.png";
|
||||
sha256 = "0ypr44sg0fn55m1b52dgr1nnscpi2p6rfkjsm7vvrdqw7bafbx2z";
|
||||
};
|
||||
opacity.terminal = 0.9;
|
||||
fonts = {
|
||||
|
||||
9
hosts/dunamis/users/user/catppuccin.nix
Normal file
9
hosts/dunamis/users/user/catppuccin.nix
Normal file
@ -0,0 +1,9 @@
|
||||
{inputs, ...}: {
|
||||
imports = with inputs; [
|
||||
catppuccin.homeManagerModules.catppuccin
|
||||
];
|
||||
catppuccin = {
|
||||
enable = true;
|
||||
flavor = "latte";
|
||||
};
|
||||
}
|
||||
@ -49,7 +49,7 @@
|
||||
|
||||
editor = {
|
||||
helix.enable = true;
|
||||
neve.enable = true;
|
||||
# neve.enable = true;
|
||||
zed.enable = true;
|
||||
};
|
||||
|
||||
|
||||
@ -49,7 +49,7 @@
|
||||
|
||||
editor = {
|
||||
helix.enable = true;
|
||||
neve.enable = true;
|
||||
# neve.enable = true;
|
||||
zed.enable = true;
|
||||
};
|
||||
|
||||
|
||||
@ -33,6 +33,7 @@ in {
|
||||
qt.enable = false;
|
||||
};
|
||||
services = {
|
||||
wpaperd.enable = true;
|
||||
playerctld.enable = true;
|
||||
network-manager-applet.enable = true;
|
||||
copyq.enable = true;
|
||||
@ -475,14 +476,14 @@ in {
|
||||
// default-column-width { proportion 0.9; }
|
||||
default-column-width {}
|
||||
tab-indicator {
|
||||
active-color "#${config.lib.stylix.colors.base0A}"
|
||||
inactive-color "#${config.lib.stylix.colors.base05}"
|
||||
active-color "#${config.lib.stylix.colors.base04}"
|
||||
inactive-color "#${config.lib.stylix.colors.base03}"
|
||||
width 8
|
||||
gap 8
|
||||
gap 6
|
||||
corner-radius 4
|
||||
gaps-between-tabs 4
|
||||
length total-proportion=0.9
|
||||
position "left"
|
||||
gaps-between-tabs 0
|
||||
length total-proportion=0.3
|
||||
position "bottom"
|
||||
place-within-column
|
||||
}
|
||||
focus-ring {
|
||||
@ -1071,7 +1072,6 @@ in {
|
||||
}
|
||||
'';
|
||||
};
|
||||
programs.wpaperd.enable = true;
|
||||
home.packages = with pkgs; [
|
||||
(ifLaptop brightnessctl)
|
||||
nautilus
|
||||
@ -1097,7 +1097,7 @@ in {
|
||||
if config.stylix.polarity == "dark"
|
||||
then "Papirus-Dark"
|
||||
else "Papirus-Light";
|
||||
package = pkgs.papirus-icon-theme;
|
||||
package = pkgs.papirus-nord;
|
||||
};
|
||||
};
|
||||
qt = {
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
imports = [
|
||||
./helix.nix
|
||||
./zed.nix
|
||||
./neve.nix
|
||||
# ./neve.nix
|
||||
#./nixvim.nix
|
||||
];
|
||||
}
|
||||
|
||||
@ -39,7 +39,10 @@ in {
|
||||
wrap-indicator = "";
|
||||
};
|
||||
};
|
||||
keys.normal = {
|
||||
keys = {
|
||||
insert.C-c = "normal_mode";
|
||||
normal = {
|
||||
esc = ["collapse_selection" "keep_primary_selection"];
|
||||
space = {
|
||||
space = "file_picker";
|
||||
w = ":w";
|
||||
@ -50,43 +53,32 @@ in {
|
||||
"." = "goto_next_buffer";
|
||||
l = ":reflow";
|
||||
};
|
||||
esc = ["collapse_selection" "keep_primary_selection"];
|
||||
};
|
||||
};
|
||||
};
|
||||
languages = {
|
||||
language-server = {
|
||||
clangd = {
|
||||
command = "${pkgs.clang-tools}/bin/clangd";
|
||||
};
|
||||
rust-analyzer = {
|
||||
command = "${pkgs.rust-analyzer}/bin/rust-analyzer";
|
||||
};
|
||||
texlab = {
|
||||
command = "${pkgs.texlab}/bin/texlab";
|
||||
};
|
||||
nil = {
|
||||
command = "${pkgs.nil}/bin/nil";
|
||||
};
|
||||
markdown-oxide = {
|
||||
command = "${pkgs.markdown-oxide}/bin/markdown-oxide";
|
||||
};
|
||||
tinymist = {
|
||||
command = lib.getExe pkgs.tinymist;
|
||||
};
|
||||
language-server = with lib; {
|
||||
clangd.command = "${pkgs.clang-tools}/bin/clangd";
|
||||
markdown-oxide.command = getExe pkgs.markdown-oxide;
|
||||
nil.command = getExe pkgs.nil;
|
||||
nixd.command = getExe pkgs.nixd;
|
||||
rust-analyzer.command = getExe pkgs.rust-analyzer;
|
||||
# texlab.command = getExe pkgs.texlab;
|
||||
tinymist.command = getExe pkgs.tinymist;
|
||||
};
|
||||
language = [
|
||||
{
|
||||
name = "nix";
|
||||
auto-format = true;
|
||||
formatter.command = "${pkgs.alejandra}/bin/alejandra";
|
||||
language-servers = ["nil"];
|
||||
}
|
||||
{
|
||||
name = "latex";
|
||||
auto-format = true;
|
||||
formatter.command = "${pkgs.texlivePackages.latexindent}/bin/latexindent";
|
||||
language-servers = ["texlab"];
|
||||
language-servers = ["nixd"];
|
||||
}
|
||||
# {
|
||||
# name = "latex";
|
||||
# auto-format = true;
|
||||
# formatter.command = "${pkgs.texlivePackages.latexindent}/bin/latexindent";
|
||||
# language-servers = ["texlab"];
|
||||
# }
|
||||
{
|
||||
name = "typst";
|
||||
auto-format = true;
|
||||
|
||||
@ -22,6 +22,7 @@ in {
|
||||
eza.enable = true;
|
||||
zoxide.enable = true;
|
||||
direnv.enable = true;
|
||||
direnv.silent = true;
|
||||
nix-your-shell.enable = true;
|
||||
keychain.enable = true;
|
||||
keychain.extraFlags = ["--quiet" "--noask"];
|
||||
|
||||
@ -20,8 +20,9 @@ in {
|
||||
relaysEnabled = false;
|
||||
};
|
||||
devices = {
|
||||
"dunamis" = {id = "72VRZFX-65SZUKP-2XL2WLG-75MMKLG-PQLDEZN-G5OI5U7-RLF4OHS-LNCXEQX";};
|
||||
"sarien" = {id = "LUVZGFV-OV6FV5E-SDROWHZ-4BR5PFB-VP5Y326-AFEP6NL-ORUMJQQ-SSYCQQO";};
|
||||
"dunamis".id = "72VRZFX-65SZUKP-2XL2WLG-75MMKLG-PQLDEZN-G5OI5U7-RLF4OHS-LNCXEQX";
|
||||
"sarien".id = "LUVZGFV-OV6FV5E-SDROWHZ-4BR5PFB-VP5Y326-AFEP6NL-ORUMJQQ-SSYCQQO";
|
||||
"phone".id = "XBZLA7Y-YOBZHLO-MSTRAGS-6SN5MEZ-FDKR76F-DIX2BKE-FMDNUYR-TMD6UAQ";
|
||||
};
|
||||
folders = {
|
||||
"docs" = {
|
||||
@ -29,6 +30,7 @@ in {
|
||||
devices = [
|
||||
"dunamis"
|
||||
"sarien"
|
||||
"phone"
|
||||
];
|
||||
};
|
||||
"programming" = {
|
||||
|
||||
Reference in New Issue
Block a user