mirror of
https://codeberg.org/ultra/nixos-dotfiles.git
synced 2024-11-25 15:13:12 +02:00
Compare commits
No commits in common. "27f3ea6a9af3d682388ca35dba584c25addad286" and "43482d60ddabef56bd4959cdacb861af6f6debe7" have entirely different histories.
27f3ea6a9a
...
43482d60dd
9 changed files with 177 additions and 618 deletions
547
flake.lock
547
flake.lock
|
|
@ -20,11 +20,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1728902391,
|
||||
"narHash": "sha256-44bnoY0nAvbBQ/lVjmn511yL39Sv7SknV0BDxn34P3Q=",
|
||||
"lastModified": 1723405438,
|
||||
"narHash": "sha256-bpmC2m7OhlDvqgQZdZ2jBLyeIkq/Jld3X4bqRAxBSp8=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "aquamarine",
|
||||
"rev": "9874e08eec85b5542ca22494e127b0cdce46b786",
|
||||
"rev": "9312aa28271c91e5d67ecb9def527b2bbcff0e66",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -98,11 +98,11 @@
|
|||
"nixpkgs-stable": "nixpkgs-stable"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1729390258,
|
||||
"narHash": "sha256-z4Hg8k6iXIV55lA8HUntfJBdBzxOuG8M4ftWoJhrVqU=",
|
||||
"lastModified": 1723741945,
|
||||
"narHash": "sha256-4q55tQohX0RYTqPJyh59FQ5VDb39Ukz3qnXQgFvyNcE=",
|
||||
"owner": "nix-community",
|
||||
"repo": "emacs-overlay",
|
||||
"rev": "89860b1c343648e8d71b6820e9311b98353ff14e",
|
||||
"rev": "45ea19bb0b9b7cbc6ca190ebbb5cff014ca32e1a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -142,11 +142,11 @@
|
|||
"rust-overlay": "rust-overlay"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1728712190,
|
||||
"narHash": "sha256-GxbKoS2TQNMeD4dbZn1IU+/BOiYGeVALHVAbZnFc3UU=",
|
||||
"lastModified": 1720177068,
|
||||
"narHash": "sha256-LTSFlW/46hl1u9SzqnvbtNxswCW05bhwOY6CzVEJC5o=",
|
||||
"owner": "elkowar",
|
||||
"repo": "eww",
|
||||
"rev": "50ec181fc7ff2a68d6330e8897de2c5179575935",
|
||||
"rev": "4d55e9ad63d1fae887726dffcd25a32def23d34f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -156,17 +156,17 @@
|
|||
}
|
||||
},
|
||||
"flake-compat": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1709944340,
|
||||
"narHash": "sha256-xr54XK0SjczlUxRo5YwodibUSlpivS9bqHt8BNyWVQA=",
|
||||
"lastModified": 1696426674,
|
||||
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"rev": "baa7aa7bd0a570b3b9edd0b8da859fee3ffaa4d4",
|
||||
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "edolstra",
|
||||
"ref": "refs/pull/65/head",
|
||||
"repo": "flake-compat",
|
||||
"type": "github"
|
||||
}
|
||||
|
|
@ -188,22 +188,6 @@
|
|||
}
|
||||
},
|
||||
"flake-compat_3": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1696426674,
|
||||
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-compat_4": {
|
||||
"locked": {
|
||||
"lastModified": 1696426674,
|
||||
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
|
||||
|
|
@ -235,64 +219,10 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-parts_2": {
|
||||
"inputs": {
|
||||
"nixpkgs-lib": "nixpkgs-lib_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1727826117,
|
||||
"narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils": {
|
||||
"inputs": {
|
||||
"systems": "systems"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1726560853,
|
||||
"narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils_2": {
|
||||
"inputs": {
|
||||
"systems": "systems_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1709126324,
|
||||
"narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "d465f4819400de7c8d874d50b982301f28a84605",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils_3": {
|
||||
"inputs": {
|
||||
"systems": "systems_4"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1710146030,
|
||||
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
|
||||
|
|
@ -307,43 +237,75 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"gitignore": {
|
||||
"flake-utils_2": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"hyprland",
|
||||
"pre-commit-hooks",
|
||||
"nixpkgs"
|
||||
]
|
||||
"systems": "systems_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1709087332,
|
||||
"narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "gitignore.nix",
|
||||
"rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
|
||||
"lastModified": 1705309234,
|
||||
"narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "hercules-ci",
|
||||
"repo": "gitignore.nix",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils_3": {
|
||||
"inputs": {
|
||||
"systems": "systems_3"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1709126324,
|
||||
"narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "d465f4819400de7c8d874d50b982301f28a84605",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils_4": {
|
||||
"inputs": {
|
||||
"systems": "systems_5"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1710146030,
|
||||
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"helix": {
|
||||
"inputs": {
|
||||
"crane": "crane",
|
||||
"flake-utils": "flake-utils_2",
|
||||
"flake-utils": "flake-utils_3",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"rust-overlay": "rust-overlay_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1729331287,
|
||||
"narHash": "sha256-CiQsoNEOGHkSfG/0JJMegHfwXUAI0PwAIVj3i3FmGao=",
|
||||
"lastModified": 1723657484,
|
||||
"narHash": "sha256-oSxczvhDKCc/ilTPiMz46RmTLhyBoVxhGWhp7Ee54eA=",
|
||||
"owner": "helix-editor",
|
||||
"repo": "helix",
|
||||
"rev": "be2884d80061493ab1999d73ffa51dfb4f59639d",
|
||||
"rev": "ff33b07756548935577aefc15cf48a1beb27b162",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -360,11 +322,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1729321331,
|
||||
"narHash": "sha256-KVyQq+ez/oB30/WbdNgVD8g/bda34z8NiU187QKQb74=",
|
||||
"lastModified": 1723399884,
|
||||
"narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "122f70545b29ccb922e655b08acfe05bfb44ec68",
|
||||
"rev": "086f619dd991a4d355c07837448244029fc2d9ab",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -380,11 +342,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1729224425,
|
||||
"narHash": "sha256-w9dNUedNe2qnhHuhcRf7A1l29+/6DxdMfwN6g4U3c/w=",
|
||||
"lastModified": 1722636442,
|
||||
"narHash": "sha256-+7IS0n3/F0I5j6ZbrVlLcIIPHY3o+/vLAqg/G48sG+w=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "contrib",
|
||||
"rev": "d72bc8b1cd30d448bd438e8328f8eeb4c0f2ddb6",
|
||||
"rev": "9d67858b437d4a1299be496d371b66fc0d3e01f6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -409,11 +371,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1728669738,
|
||||
"narHash": "sha256-EDNAU9AYcx8OupUzbTbWE1d3HYdeG0wO6Msg3iL1muk=",
|
||||
"lastModified": 1722623071,
|
||||
"narHash": "sha256-sLADpVgebpCBFXkA1FlCXtvEPu1tdEsTfqK1hfeHySE=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprcursor",
|
||||
"rev": "0264e698149fcb857a66a53018157b41f8d97bb0",
|
||||
"rev": "912d56025f03d41b1ad29510c423757b4379eb1c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -426,23 +388,21 @@
|
|||
"inputs": {
|
||||
"aquamarine": "aquamarine",
|
||||
"hyprcursor": "hyprcursor",
|
||||
"hyprland-protocols": "hyprland-protocols",
|
||||
"hyprlang": "hyprlang",
|
||||
"hyprutils": "hyprutils",
|
||||
"hyprwayland-scanner": "hyprwayland-scanner",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"pre-commit-hooks": "pre-commit-hooks",
|
||||
"systems": "systems_3",
|
||||
"systems": "systems_4",
|
||||
"xdph": "xdph"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1729378105,
|
||||
"narHash": "sha256-rDOABbycdmMH57XyN/9xEDuKIpnsw5vjSrJJWgVQvKI=",
|
||||
"lastModified": 1723738578,
|
||||
"narHash": "sha256-5thJZNPXwzPAuorW0+0slha1fylbEUHmu0vutXVaARM=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "Hyprland",
|
||||
"rev": "08cc063e175e48cea44d26b7e3762f4b8611f0c5",
|
||||
"rev": "12d9901472c6f9128fa8b16c25b3a879d1859e60",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -455,19 +415,21 @@
|
|||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"hyprland",
|
||||
"xdph",
|
||||
"nixpkgs"
|
||||
],
|
||||
"systems": [
|
||||
"hyprland",
|
||||
"xdph",
|
||||
"systems"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1728345020,
|
||||
"narHash": "sha256-xGbkc7U/Roe0/Cv3iKlzijIaFBNguasI31ynL2IlEoM=",
|
||||
"lastModified": 1721326555,
|
||||
"narHash": "sha256-zCu4R0CSHEactW9JqYki26gy8h9f6rHmSwj4XJmlHgg=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprland-protocols",
|
||||
"rev": "a7c183800e74f337753de186522b9017a07a8cee",
|
||||
"rev": "5a11232266bf1a1f5952d5b179c3f4b2facaaa84",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -492,11 +454,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1728168612,
|
||||
"narHash": "sha256-AnB1KfiXINmuiW7BALYrKqcjCnsLZPifhb/7BsfPbns=",
|
||||
"lastModified": 1721324361,
|
||||
"narHash": "sha256-BiJKO0IIdnSwHQBSrEJlKlFr753urkLE48wtt0UhNG4=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprlang",
|
||||
"rev": "f054f2e44d6a0b74607a6bc0f52dba337a3db38e",
|
||||
"rev": "adbefbf49664a6c2c8bf36b6487fd31e3eb68086",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -517,11 +479,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1728941256,
|
||||
"narHash": "sha256-WRypmcZ2Bw94lLmcmxYokVOHPJSZ7T06V49QZ4tkZeQ=",
|
||||
"lastModified": 1722869141,
|
||||
"narHash": "sha256-0KU4qhyMp441qfwbirNg3+wbm489KnEjXOz2I/RbeFs=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprutils",
|
||||
"rev": "fd4be8b9ca932f7384e454bcd923c5451ef2aa85",
|
||||
"rev": "0252fd13e78e60fb0da512a212e56007515a49f7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -542,11 +504,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1726874836,
|
||||
"narHash": "sha256-VKR0sf0PSNCB0wPHVKSAn41mCNVCnegWmgkrneKDhHM=",
|
||||
"lastModified": 1721324119,
|
||||
"narHash": "sha256-SOOqIT27/X792+vsLSeFdrNTF+OSRp5qXv6Te+fb2Qg=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprwayland-scanner",
|
||||
"rev": "500c81a9e1a76760371049a8d99e008ea77aa59e",
|
||||
"rev": "a048a6cb015340bd82f97c1f40a4b595ca85cc30",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -555,30 +517,10 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"iceshrimp": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1718289195,
|
||||
"narHash": "sha256-xmkExjsTztXW4/AYb3d3Er6Wwg4r7AVwq7rv9E93+Ec=",
|
||||
"ref": "refs/heads/dev",
|
||||
"rev": "746c6319d3425ccfacc906535c67951e161996d9",
|
||||
"revCount": 47,
|
||||
"type": "git",
|
||||
"url": "https://iceshrimp.dev/iceshrimp/packaging"
|
||||
},
|
||||
"original": {
|
||||
"type": "git",
|
||||
"url": "https://iceshrimp.dev/iceshrimp/packaging"
|
||||
}
|
||||
},
|
||||
"mailserver": {
|
||||
"inputs": {
|
||||
"blobs": "blobs",
|
||||
"flake-compat": "flake-compat_3",
|
||||
"flake-compat": "flake-compat_2",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
|
|
@ -598,63 +540,6 @@
|
|||
"type": "gitlab"
|
||||
}
|
||||
},
|
||||
"niri": {
|
||||
"inputs": {
|
||||
"flake-parts": "flake-parts_2",
|
||||
"niri-stable": "niri-stable",
|
||||
"niri-unstable": "niri-unstable",
|
||||
"nixpkgs": "nixpkgs_2",
|
||||
"nixpkgs-stable": "nixpkgs-stable_3",
|
||||
"xwayland-satellite-stable": "xwayland-satellite-stable",
|
||||
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1729334880,
|
||||
"narHash": "sha256-HUdIqrv4/s0bohHYtCHl44bJwyL1TMN1kzk+93oSAm8=",
|
||||
"owner": "sodiboo",
|
||||
"repo": "niri-flake",
|
||||
"rev": "28881a002ab986bd107c06cdc4b5df98bad29f7f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "sodiboo",
|
||||
"repo": "niri-flake",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"niri-stable": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1726304152,
|
||||
"narHash": "sha256-4YDrKMwXGVOBkeaISbxqf24rLuHvO98TnqxWYfgiSeg=",
|
||||
"owner": "YaLTeR",
|
||||
"repo": "niri",
|
||||
"rev": "6a48728ffb1e638839b07f9ab2f06b2adb41dc61",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "YaLTeR",
|
||||
"ref": "v0.1.9",
|
||||
"repo": "niri",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"niri-unstable": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1729330424,
|
||||
"narHash": "sha256-fEev4uBYKTdFACj3zGmMniNV8IbzfoJ+LqZz2eWQWcw=",
|
||||
"owner": "YaLTeR",
|
||||
"repo": "niri",
|
||||
"rev": "10f04fd19de3bc2951d42411c237c8b963e6c816",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "YaLTeR",
|
||||
"repo": "niri",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nix-but-gigachad": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
|
|
@ -662,11 +547,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1728371783,
|
||||
"narHash": "sha256-ufI7115ims2PPxggpWQhigAUrwlwu155wVgngZzzyZ0=",
|
||||
"lastModified": 1723753423,
|
||||
"narHash": "sha256-ULsoflnTS634565jqT1IXwHzISwcphLBq+YJYL7/p/Y=",
|
||||
"owner": "viperML",
|
||||
"repo": "nh",
|
||||
"rev": "afdff9ab4fdb9c329b5d97c5b742242b97f8754d",
|
||||
"rev": "24d7b24f567ef3345ac267f61579df291e42bd71",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -697,11 +582,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1729394935,
|
||||
"narHash": "sha256-2ntUG+NJKdfhlrh/tF+jOU0fOesO7lm5ZZVSYitsvH8=",
|
||||
"lastModified": 1723352546,
|
||||
"narHash": "sha256-WTIrvp0yV8ODd6lxAq4F7EbrPQv0gscBnyfn559c3k8=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-index-database",
|
||||
"rev": "04f8a11f247ba00263b060fbcdc95484fd046104",
|
||||
"rev": "ec78079a904d7d55e81a0468d764d0fffb50ac06",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -713,24 +598,24 @@
|
|||
"nix-inst": {
|
||||
"inputs": {
|
||||
"crane": "crane_2",
|
||||
"flake-compat": "flake-compat_4",
|
||||
"flake-utils": "flake-utils_3",
|
||||
"flake-compat": "flake-compat_3",
|
||||
"flake-utils": "flake-utils_4",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1728596811,
|
||||
"narHash": "sha256-Eeq8s0uYxtI1Hoe6NQR4h9slj46pzCaztmo5nd/7Klo=",
|
||||
"lastModified": 1716760747,
|
||||
"narHash": "sha256-LVWZLkuhcWOzy3I0wAsUpYeJqMi/pSiF9E9UQawG6r8=",
|
||||
"ref": "refs/heads/trunk",
|
||||
"rev": "120c37cc9e475cea218f1173901e3bbba3a4e157",
|
||||
"revCount": 123,
|
||||
"rev": "a07893a28ff8e0ba2537e699a01593112a1b0789",
|
||||
"revCount": 122,
|
||||
"type": "git",
|
||||
"url": "https://git.envs.net/binarycat/nix-inst"
|
||||
"url": "http://git.envs.net/binarycat/nix-inst"
|
||||
},
|
||||
"original": {
|
||||
"type": "git",
|
||||
"url": "https://git.envs.net/binarycat/nix-inst"
|
||||
"url": "http://git.envs.net/binarycat/nix-inst"
|
||||
}
|
||||
},
|
||||
"nix-software-center": {
|
||||
|
|
@ -783,11 +668,11 @@
|
|||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1729333370,
|
||||
"narHash": "sha256-NU+tYe3QWzDNpB8RagpqR3hNQXn4BNuBd7ZGosMHLL8=",
|
||||
"lastModified": 1723310128,
|
||||
"narHash": "sha256-IiH8jG6PpR4h9TxSGMYh+2/gQiJW9MwehFvheSb5rPc=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "38279034170b1e2929b2be33bdaedbf14a57bfeb",
|
||||
"rev": "c54cf53e022b0b3c1d3b8207aa0f9b194c24f0cf",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -798,11 +683,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1729256560,
|
||||
"narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=",
|
||||
"lastModified": 1723637854,
|
||||
"narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0",
|
||||
"rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -845,25 +730,13 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-lib_2": {
|
||||
"locked": {
|
||||
"lastModified": 1727825735,
|
||||
"narHash": "sha256-0xHYkMkeLVQAMa7gvkddbPqpxph+hDzdu1XdGPJR+Os=",
|
||||
"type": "tarball",
|
||||
"url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
"url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz"
|
||||
}
|
||||
},
|
||||
"nixpkgs-master": {
|
||||
"locked": {
|
||||
"lastModified": 1729403505,
|
||||
"narHash": "sha256-1ILT9fxCbNQuToPWBhxC3N+hblIWW3WlEHnwcdoCBHE=",
|
||||
"lastModified": 1723752995,
|
||||
"narHash": "sha256-aEt77V/MIFSWmK4TNtF/ZfoFZtG/jfS3GjOzsupJguA=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "88d3f02d308cb29a07942d24539f960721a20fe0",
|
||||
"rev": "cd7b30af7979d9942a8ce88de8c9ffecd4cbfcf5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -875,43 +748,11 @@
|
|||
},
|
||||
"nixpkgs-stable": {
|
||||
"locked": {
|
||||
"lastModified": 1729181673,
|
||||
"narHash": "sha256-LDiPhQ3l+fBjRATNtnuDZsBS7hqoBtPkKBkhpoBHv3I=",
|
||||
"lastModified": 1723556749,
|
||||
"narHash": "sha256-+CHVZnTnIYRLYsARInHYoWkujzcRkLY/gXm3s5bE52o=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "4eb33fe664af7b41a4c446f87d20c9a0a6321fa3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-24.05",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-stable_2": {
|
||||
"locked": {
|
||||
"lastModified": 1720386169,
|
||||
"narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "194846768975b7ad2c4988bdb82572c00222c0d7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-24.05",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-stable_3": {
|
||||
"locked": {
|
||||
"lastModified": 1729181673,
|
||||
"narHash": "sha256-LDiPhQ3l+fBjRATNtnuDZsBS7hqoBtPkKBkhpoBHv3I=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "4eb33fe664af7b41a4c446f87d20c9a0a6321fa3",
|
||||
"rev": "4a92571f9207810b559c9eac203d1f4d79830073",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -923,11 +764,11 @@
|
|||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1729256560,
|
||||
"narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=",
|
||||
"lastModified": 1723637854,
|
||||
"narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0",
|
||||
"rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -937,46 +778,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1729256560,
|
||||
"narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"pre-commit-hooks": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat_2",
|
||||
"gitignore": "gitignore",
|
||||
"nixpkgs": [
|
||||
"hyprland",
|
||||
"nixpkgs"
|
||||
],
|
||||
"nixpkgs-stable": "nixpkgs-stable_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1728778939,
|
||||
"narHash": "sha256-WybK5E3hpGxtCYtBwpRj1E9JoiVxe+8kX83snTNaFHE=",
|
||||
"owner": "cachix",
|
||||
"repo": "git-hooks.nix",
|
||||
"rev": "ff68f91754be6f3427e4986d7949e6273659be1d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "cachix",
|
||||
"repo": "git-hooks.nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"emacs-overlay": "emacs-overlay",
|
||||
|
|
@ -986,31 +787,30 @@
|
|||
"home-manager": "home-manager",
|
||||
"hypr-contrib": "hypr-contrib",
|
||||
"hyprland": "hyprland",
|
||||
"iceshrimp": "iceshrimp",
|
||||
"mailserver": "mailserver",
|
||||
"niri": "niri",
|
||||
"nix-but-gigachad": "nix-but-gigachad",
|
||||
"nix-index-database": "nix-index-database",
|
||||
"nix-inst": "nix-inst",
|
||||
"nix-software-center": "nix-software-center",
|
||||
"nixos-hardware": "nixos-hardware",
|
||||
"nixpkgs": "nixpkgs_3",
|
||||
"nixpkgs": "nixpkgs_2",
|
||||
"nixpkgs-master": "nixpkgs-master"
|
||||
}
|
||||
},
|
||||
"rust-overlay": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils_2",
|
||||
"nixpkgs": [
|
||||
"eww",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1725675754,
|
||||
"narHash": "sha256-hXW3csqePOcF2e/PYnpXj72KEYyNj2HzTrVNmS/F7Ug=",
|
||||
"lastModified": 1708999822,
|
||||
"narHash": "sha256-X55GxqI3oDEfqy38Pt7xyypYNly4bkd/RajFE+FGn+A=",
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"rev": "8cc45e678e914a16c8e224c3237fb07cf21e5e54",
|
||||
"rev": "1a618c62479a6896ac497aaa0d969c6bd8e24911",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1075,21 +875,6 @@
|
|||
}
|
||||
},
|
||||
"systems_3": {
|
||||
"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_4": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
|
|
@ -1104,6 +889,21 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"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": {
|
||||
"lastModified": 1681028828,
|
||||
|
|
@ -1119,9 +919,24 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"systems_6": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"utils": {
|
||||
"inputs": {
|
||||
"systems": "systems_5"
|
||||
"systems": "systems_6"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1689068808,
|
||||
|
|
@ -1139,22 +954,11 @@
|
|||
},
|
||||
"xdph": {
|
||||
"inputs": {
|
||||
"hyprland-protocols": [
|
||||
"hyprland",
|
||||
"hyprland-protocols"
|
||||
],
|
||||
"hyprland-protocols": "hyprland-protocols",
|
||||
"hyprlang": [
|
||||
"hyprland",
|
||||
"hyprlang"
|
||||
],
|
||||
"hyprutils": [
|
||||
"hyprland",
|
||||
"hyprutils"
|
||||
],
|
||||
"hyprwayland-scanner": [
|
||||
"hyprland",
|
||||
"hyprwayland-scanner"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"hyprland",
|
||||
"nixpkgs"
|
||||
|
|
@ -1165,11 +969,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1728166987,
|
||||
"narHash": "sha256-w6dVTguAn9zJ+7aPOhBQgDz8bn6YZ7b56cY8Kg5HJRI=",
|
||||
"lastModified": 1722365976,
|
||||
"narHash": "sha256-Khdm+mDzYA//XaU0M+hftod+rKr5q9SSHSEuiQ0/9ow=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "xdg-desktop-portal-hyprland",
|
||||
"rev": "fb9c8d665af0588bb087f97d0f673ddf0d501787",
|
||||
"rev": "7f2a77ddf60390248e2a3de2261d7102a13e5341",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1177,39 +981,6 @@
|
|||
"repo": "xdg-desktop-portal-hyprland",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"xwayland-satellite-stable": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1718165778,
|
||||
"narHash": "sha256-dwF9nI54a6Fo9XU5s4qmvMXSgCid3YQVGxch00qEMvI=",
|
||||
"owner": "Supreeeme",
|
||||
"repo": "xwayland-satellite",
|
||||
"rev": "b6d281967cb0b7bf1dfdb8d0f597b517dc4aa5c5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "Supreeeme",
|
||||
"ref": "v0.4",
|
||||
"repo": "xwayland-satellite",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"xwayland-satellite-unstable": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1729139001,
|
||||
"narHash": "sha256-BADKw4fQma8tUNBRfmS9YLXTRXK4nYyXIxQdhGuEV0s=",
|
||||
"owner": "Supreeeme",
|
||||
"repo": "xwayland-satellite",
|
||||
"rev": "ab2d09962c425670a4a7ca6ef5d92a0f06632499",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "Supreeeme",
|
||||
"repo": "xwayland-satellite",
|
||||
"type": "github"
|
||||
}
|
||||
}
|
||||
},
|
||||
"root": "root",
|
||||
|
|
|
|||
|
|
@ -51,14 +51,7 @@
|
|||
url = "github:nix-community/emacs-overlay";
|
||||
};
|
||||
nix-inst = {
|
||||
url = "git+https://git.envs.net/binarycat/nix-inst";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
niri = {
|
||||
url = "github:sodiboo/niri-flake";
|
||||
};
|
||||
iceshrimp = {
|
||||
url = "git+https://iceshrimp.dev/iceshrimp/packaging";
|
||||
url = "git+http://git.envs.net/binarycat/nix-inst";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@ in {
|
|||
imports =
|
||||
[ # Include the results of the hardware scan.
|
||||
./hardware-configuration.nix
|
||||
inputs.niri.nixosModules.niri
|
||||
];
|
||||
|
||||
# qt.platformTheme = lib.mkForce "gtk2";
|
||||
|
|
@ -71,12 +70,7 @@ in {
|
|||
libinput.enable = true;
|
||||
};
|
||||
flatpak.enable = true;
|
||||
printing = {
|
||||
enable = true;
|
||||
drivers = with pkgs; [
|
||||
hplip
|
||||
];
|
||||
};
|
||||
printing.enable = true;
|
||||
openssh.enable = true;
|
||||
guix = {
|
||||
enable = false;
|
||||
|
|
@ -89,9 +83,6 @@ in {
|
|||
tailscale = {
|
||||
enable = true;
|
||||
};
|
||||
gnome = {
|
||||
gnome-remote-desktop.enable = true;
|
||||
};
|
||||
};
|
||||
qt.platformTheme = lib.mkForce "gnome";
|
||||
|
||||
|
|
@ -135,8 +126,8 @@ in {
|
|||
remmina
|
||||
arduino-ide
|
||||
prusa-slicer
|
||||
weylus
|
||||
deskreen
|
||||
solaar
|
||||
niri
|
||||
];
|
||||
shell = pkgs.zsh;
|
||||
ignoreShellProgramCheck = true; # I configured zsh with home-manager
|
||||
|
|
@ -151,12 +142,6 @@ in {
|
|||
# Allow unfree packages
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
|
||||
nixpkgs = {
|
||||
overlays = [
|
||||
inputs.niri.overlays.niri
|
||||
];
|
||||
};
|
||||
|
||||
# List packages installed in system profile. To search, run:
|
||||
# $ nix search wget
|
||||
environment.systemPackages = with pkgs; [
|
||||
|
|
@ -170,7 +155,6 @@ in {
|
|||
gnomeExtensions.gsconnect
|
||||
gnomeExtensions.media-controls
|
||||
gnomeExtensions.solaar-extension
|
||||
gnomeExtensions.paperwm
|
||||
nerdfonts
|
||||
everblush
|
||||
bibata-cursors
|
||||
|
|
@ -179,10 +163,6 @@ in {
|
|||
gnome.gnome-software
|
||||
evtest
|
||||
appimagekit
|
||||
solaar
|
||||
hplip
|
||||
cozette
|
||||
gnome.gnome-remote-desktop
|
||||
];
|
||||
|
||||
# Some programs need SUID wrappers, can be configured further or are
|
||||
|
|
@ -265,26 +245,4 @@ in {
|
|||
|
||||
hardware.wooting.enable = true;
|
||||
hardware.flipperzero.enable = true;
|
||||
hardware = {
|
||||
logitech = {
|
||||
wireless = {
|
||||
enable = true;
|
||||
enableGraphical = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
programs = {
|
||||
niri = {
|
||||
enable = true;
|
||||
package = pkgs.niri;
|
||||
};
|
||||
};
|
||||
|
||||
xdg = {
|
||||
portal = {
|
||||
enable = true;
|
||||
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,8 +19,6 @@ in {
|
|||
( import ./services/matrix.nix inputs )
|
||||
( import ./services/tor.nix inputs )
|
||||
( import ./services/navidrome.nix inputs )
|
||||
# ( import ./services/iceshrimp.nix inputs )
|
||||
( import ./services/slskd.nix inputs )
|
||||
# ( import ./services/office.nix inputs )
|
||||
# ( import ./services/Sharkey inputs )
|
||||
# ( import ./services/caddy.nix inputs ) # doesn't work
|
||||
|
|
|
|||
|
|
@ -1,21 +0,0 @@
|
|||
inputs: { pkgs, config, ... }: {
|
||||
imports = [
|
||||
inputs.iceshrimp.nixosModules.iceshrimp
|
||||
];
|
||||
services.iceshrimp = {
|
||||
enable = true;
|
||||
createDb = true;
|
||||
dbPasswordFile = /var/keys/iceshrimpdbpass;
|
||||
secretConfig = /var/keys/is_secrets.yml;
|
||||
settings = {
|
||||
url = "https://is.phite.ro";
|
||||
accountDomain = "phite.ro";
|
||||
port = 3010;
|
||||
maxNoteLength = 100000;
|
||||
maxCaptionLength = 8192;
|
||||
disableHsts = true; # caddy will handle that
|
||||
clusterLimit = 4;
|
||||
outgoingAddressFamily = "dual";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -1,19 +0,0 @@
|
|||
inputs: { pkgs, ... }: {
|
||||
services.slskd = {
|
||||
enable = true;
|
||||
environmentFile = /var/keys/slsk.env;
|
||||
domain = null;
|
||||
|
||||
settings = {
|
||||
web = {
|
||||
port = 3011;
|
||||
https.disabled = true;
|
||||
};
|
||||
# directories.downloads = "/var/navidrome/music";
|
||||
shares.directories = [
|
||||
"/home/ultra/Music"
|
||||
"/var/navidrome/music"
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
inputs: { pkgs, ... }: {
|
||||
services.syncthing = {
|
||||
enable = true;
|
||||
user = "ultra";
|
||||
dataDir = "/home/ultra/.local/lib/syncthing";
|
||||
};
|
||||
}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
(let ((indent 4))
|
||||
(let ((indent 2))
|
||||
(setq standard-indent indent)
|
||||
(setq-default indent-tabs-mode nil)
|
||||
(setq-default tab-width 2)
|
||||
|
|
@ -11,13 +11,13 @@
|
|||
(set-face-attribute 'default nil :height (font-size-to-height font-size)))
|
||||
(setq mastodon-instance-url "https://shonk.phite.ro"
|
||||
mastodon-active-user "graphite")
|
||||
;(evil-mode 1)
|
||||
(evil-mode 1)
|
||||
(add-hook 'lisp-mode 'parinfer-rust-mode)
|
||||
(require 'bshell)
|
||||
(add-hook 'eshell-load-hook #'eat-eshell-mode)
|
||||
(add-hook 'eshell-load-hook #'eat-eshell-visual-command-mode)
|
||||
; (load (expand-file-name "~/.emacs.d/everblush-theme.el"))
|
||||
; (load-theme 'uwu)
|
||||
(load-theme 'uwu)
|
||||
(if (window-system)
|
||||
(set-frame-size (selected-frame) 1000 800))
|
||||
;; (add-hook 'c++-mode-hook 'irony-mode)
|
||||
|
|
@ -56,9 +56,9 @@
|
|||
|
||||
(keymap-global-set "C-\\" #'eat)
|
||||
|
||||
;(add-hook 'eat-mode-hook (lambda () (evil-mode nil)))
|
||||
;(evil-set-initial-state 'eat-mode 'emacs)
|
||||
;(setq evil-move-beyond-eol t)
|
||||
(add-hook 'eat-mode-hook (lambda () (evil-mode nil)))
|
||||
(evil-set-initial-state 'eat-mode 'emacs)
|
||||
(setq evil-move-beyond-eol t)
|
||||
|
||||
(recentf-mode 1)
|
||||
(setq recentf-max-menu-items 25)
|
||||
|
|
@ -127,7 +127,7 @@
|
|||
|
||||
(add-hook 'prog-mode-hook #'sublimity-mode)
|
||||
|
||||
;(add-hook 'prog-mode-hook #'linum-relative-on)
|
||||
(add-hook 'prog-mode-hook #'linum-relative-on)
|
||||
|
||||
(add-hook 'prog-mode-hook #'display-line-numbers-mode)
|
||||
|
||||
|
|
@ -137,74 +137,3 @@
|
|||
|
||||
(setq pulsar-pulse t
|
||||
pulsar-delay 0.055)
|
||||
|
||||
(setq doom-themes-enable-bold t ; if nil, bold is universally disabled
|
||||
doom-themes-enable-italic t) ; if nil, italics is universally disabled
|
||||
(require 'doom-themes)
|
||||
(load-theme 'doom-tokyo-night)
|
||||
(use-package kakoune
|
||||
:bind (("C-;" . ryo-modal-mode)
|
||||
("C-z" . ryo-modal-mode)
|
||||
("<escape>" . ryo-modal-mode))
|
||||
:hook (after-init . my/kakoune-setup)
|
||||
:config
|
||||
(defun ryo-enter () "Enter normal mode" (interactive) (ryo-modal-mode 1))
|
||||
(defun my/kakoune-setup ()
|
||||
"Call kakoune-setup-keybinds then add some personal config."
|
||||
(kakoune-setup-keybinds)
|
||||
(setq ryo-modal-cursor-type 'line)
|
||||
(add-hook 'prog-mode-hook #'ryo-enter)
|
||||
(define-key ryo-modal-mode-map (kbd "SPC h") 'help-command)
|
||||
;; Access all C-x bindings easily
|
||||
(define-key ryo-modal-mode-map (kbd "z") ctl-x-map)
|
||||
(ryo-modal-keys
|
||||
("," save-buffer)
|
||||
("p" counsel-yank-pop)
|
||||
("m" mc/mark-next-like-this)
|
||||
("M" mc/skip-to-next-like-this)
|
||||
("n" mc/mark-previous-like-this)
|
||||
("N" mc/skip-to-previous-like-this)
|
||||
("M-m" mc/edit-lines)
|
||||
("*" mc/mark-all-like-this)
|
||||
("v" er/expand-region)
|
||||
("C-v" set-rectangular-region-anchor)
|
||||
("M-s" mc/split-region)
|
||||
(";" (("q" delete-window)
|
||||
("v" split-window-horizontally)
|
||||
("s" split-window-vertically)))
|
||||
("C-h" windmove-left)
|
||||
("C-j" windmove-down)
|
||||
("C-k" windmove-up)
|
||||
("C-l" windmove-right)
|
||||
("C-u" scroll-down-command :first '(deactivate-mark))
|
||||
("C-d" scroll-up-command :first '(deactivate-mark)))))
|
||||
|
||||
;; This overrides the default mark-in-region with a prettier-looking one,
|
||||
;; and provides a couple extra commands
|
||||
(use-package visual-regexp
|
||||
:ryo
|
||||
("s" vr/mc-mark)
|
||||
("?" vr/replace)
|
||||
("M-/" vr/query-replace))
|
||||
|
||||
;; Emacs incremental search doesn't work with multiple cursors, but this fixes that
|
||||
(use-package phi-search
|
||||
:bind (("C-s" . phi-search)
|
||||
("C-r" . phi-search-backward)))
|
||||
|
||||
;; Probably the first thing you'd miss is undo and redo, which requires an extra package
|
||||
;; to work like it does in kakoune (and almost every other editor).
|
||||
(use-package undo-tree
|
||||
:config
|
||||
(global-undo-tree-mode)
|
||||
:ryo
|
||||
("u" undo-tree-undo)
|
||||
("U" undo-tree-redo)
|
||||
("SPC u" undo-tree-visualize)
|
||||
:bind (:map undo-tree-visualizer-mode-map
|
||||
("h" . undo-tree-visualize-switch-branch-left)
|
||||
("j" . undo-tree-visualize-redo)
|
||||
("k" . undo-tree-visualize-undo)
|
||||
("l" . undo-tree-visualize-switch-branch-right)))
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -36,16 +36,16 @@ let
|
|||
sly
|
||||
# spacemacs-theme
|
||||
paredit
|
||||
#evil
|
||||
evil
|
||||
magit
|
||||
org
|
||||
mastodon
|
||||
eshell-z
|
||||
bshell
|
||||
eat
|
||||
#gruvbox-theme
|
||||
#uwu-theme
|
||||
#irony
|
||||
gruvbox-theme
|
||||
uwu-theme
|
||||
irony
|
||||
hotfuzz
|
||||
vertico
|
||||
marginalia
|
||||
|
|
@ -73,12 +73,6 @@ let
|
|||
linum-relative
|
||||
pulsar
|
||||
orderless
|
||||
doom-themes
|
||||
cider
|
||||
kakoune
|
||||
visual-regexp
|
||||
phi-search
|
||||
undo-tree
|
||||
];
|
||||
});
|
||||
helix = inputs.helix.packages.${pkgs.system}.default;
|
||||
|
|
@ -94,13 +88,11 @@ in {
|
|||
imports = [
|
||||
inputs.hyprland.homeManagerModules.default
|
||||
inputs.nix-index-database.hmModules.nix-index
|
||||
inputs.niri.homeModules.config
|
||||
];
|
||||
# Allow unfree packages
|
||||
nixpkgs = {
|
||||
overlays = [
|
||||
(import inputs.emacs-overlay)
|
||||
inputs.niri.overlays.niri
|
||||
];
|
||||
config = {
|
||||
allowUnfree = true;
|
||||
|
|
@ -211,7 +203,7 @@ in {
|
|||
withWayland = true;
|
||||
})
|
||||
*/
|
||||
eww
|
||||
# eww
|
||||
# (eww.override { withWayland = true; })
|
||||
notify-desktop
|
||||
libnotify
|
||||
|
|
@ -229,7 +221,7 @@ in {
|
|||
amfora
|
||||
weechat
|
||||
filezilla
|
||||
# fluffychat # insecure apparently
|
||||
fluffychat
|
||||
bitwarden
|
||||
akregator
|
||||
# bitwarden
|
||||
|
|
@ -282,12 +274,7 @@ in {
|
|||
tea
|
||||
thefuck
|
||||
playerctl
|
||||
fuzzel
|
||||
# nyxt
|
||||
lmms
|
||||
cozette
|
||||
leiningen
|
||||
sublime-music
|
||||
];
|
||||
file = {
|
||||
"emacs.d/everblush-theme.el".source = ./configs/emacs/everblush-theme.el;
|
||||
|
|
@ -499,36 +486,6 @@ in {
|
|||
enable = true;
|
||||
};
|
||||
};
|
||||
niri = {
|
||||
#enable = true;
|
||||
package = pkgs.niri-stable;
|
||||
settings = {
|
||||
outputs = {
|
||||
eDP-1 = {
|
||||
enable = true;
|
||||
scale = 2.25;
|
||||
position = { x = 0; y = 0; };
|
||||
};
|
||||
DP-2 = {
|
||||
enable = true;
|
||||
scale = 2.25;
|
||||
position = { x = 0; y = 960; };
|
||||
};
|
||||
};
|
||||
binds = with config.lib.niri.actions; {
|
||||
"Mod+T".action.spawn = "alacritty";
|
||||
"Mod+D".action.spawn = "fuzzel";
|
||||
"Mod+Shift+E".action = quit;
|
||||
"Mod+Ctrl+shift+E".action = quit { skip-confirmation = true; };
|
||||
"Mod+Shift+Slash".action = show-hotkey-overlay;
|
||||
"Mod+F".action = fullscreen-window;
|
||||
};
|
||||
};
|
||||
};
|
||||
eww = {
|
||||
enable = true;
|
||||
configDir = ./configs/eww;
|
||||
};
|
||||
};
|
||||
services = {
|
||||
dunst.enable = false;
|
||||
|
|
|
|||
Loading…
Reference in a new issue