Compare commits
No commits in common. "main" and "disko" have entirely different histories.
290
flake.lock
290
flake.lock
|
|
@ -28,11 +28,11 @@
|
|||
"systems": "systems"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1723293904,
|
||||
"narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=",
|
||||
"lastModified": 1716561646,
|
||||
"narHash": "sha256-UIGtLO89RxKt7RF2iEgPikSdU53r6v/6WYB0RW3k89I=",
|
||||
"owner": "ryantm",
|
||||
"repo": "agenix",
|
||||
"rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41",
|
||||
"rev": "c2fc0762bbe8feb06a2e59a364fa81b3a57671c9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -81,27 +81,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"crane_2": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"warthunder-leak-counter",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1718730147,
|
||||
"narHash": "sha256-QmD6B6FYpuoCqu6ZuPJH896ItNquDkn0ulQlOn4ykN8=",
|
||||
"owner": "ipetkov",
|
||||
"repo": "crane",
|
||||
"rev": "32c21c29b034d0a93fdb2379d6fabc40fc3d0e6c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "ipetkov",
|
||||
"repo": "crane",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"darwin": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
|
|
@ -176,11 +155,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1726590912,
|
||||
"narHash": "sha256-5bxY85siOIqOcQ8TOMAWLkMUZvLUADS2i5TsZhzUIZY=",
|
||||
"lastModified": 1718242063,
|
||||
"narHash": "sha256-n3AWItJ4a94GT0cray/eUV7tt3mulQ52L+lWJN9d1E8=",
|
||||
"owner": "nix-community",
|
||||
"repo": "disko",
|
||||
"rev": "d32d1504c77d7f6ba7e033357dcf638baceab9b7",
|
||||
"rev": "832a9f2c81ff3485404bd63952eadc17bf7ccef2",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -189,40 +168,22 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"dzgui": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1702780245,
|
||||
"narHash": "sha256-cdW5LN2Q7eYW8xIqKPQfeYPd7e6VdJGaoA9NMHesCrE=",
|
||||
"owner": "aclist",
|
||||
"repo": "dztui",
|
||||
"rev": "28323f3edb8fa747dc559d1939ccdd7729e4e3a1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "aclist",
|
||||
"repo": "dztui",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"dzgui-nix": {
|
||||
"inputs": {
|
||||
"dzgui": "dzgui",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1702850463,
|
||||
"narHash": "sha256-qR/c/GjsLUzrCyHN/Q9nnClduf6OqTg26S1AFYKPzxA=",
|
||||
"lastModified": 1718144257,
|
||||
"narHash": "sha256-rgRnU05sgqdDpxF3n6oaGUOGbW0xehijrBNr3DJnN3U=",
|
||||
"owner": "lelgenio",
|
||||
"repo": "dzgui-nix",
|
||||
"rev": "2ed6515b27d8186b9fedfe1dcaf861f07e796a0d",
|
||||
"rev": "c0aa386e8c08946dc2b8713e59a77cb6079a0b62",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "lelgenio",
|
||||
"ref": "dzgui-4.1.0",
|
||||
"repo": "dzgui-nix",
|
||||
"type": "github"
|
||||
}
|
||||
|
|
@ -266,6 +227,36 @@
|
|||
}
|
||||
},
|
||||
"flake-compat_2": {
|
||||
"locked": {
|
||||
"lastModified": 1696426674,
|
||||
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
|
||||
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
|
||||
"revCount": 57,
|
||||
"type": "tarball",
|
||||
"url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
"url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"
|
||||
}
|
||||
},
|
||||
"flake-compat_3": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1650374568,
|
||||
"narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=",
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"rev": "b4a34015c698c7793d592d66adbab377907a2be8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-compat_4": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1696426674,
|
||||
|
|
@ -299,6 +290,24 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils-plus": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils_4"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1696331477,
|
||||
"narHash": "sha256-YkbRa/1wQWdWkVJ01JvV+75KIdM37UErqKgTf0L54Fk=",
|
||||
"owner": "gytis-ivaskevicius",
|
||||
"repo": "flake-utils-plus",
|
||||
"rev": "bfc53579db89de750b25b0c5e7af299e0c06d7d3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "gytis-ivaskevicius",
|
||||
"repo": "flake-utils-plus",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils_2": {
|
||||
"inputs": {
|
||||
"systems": "systems_3"
|
||||
|
|
@ -337,11 +346,11 @@
|
|||
"systems": "systems_5"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1681202837,
|
||||
"narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
|
||||
"lastModified": 1694529238,
|
||||
"narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "cfacdce06f30d2b68473a46042957675eebb3401",
|
||||
"rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -352,7 +361,7 @@
|
|||
},
|
||||
"flake-utils_5": {
|
||||
"inputs": {
|
||||
"systems": "systems_6"
|
||||
"systems": "systems_7"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1681202837,
|
||||
|
|
@ -370,7 +379,7 @@
|
|||
},
|
||||
"flake-utils_6": {
|
||||
"inputs": {
|
||||
"systems": "systems_7"
|
||||
"systems": "systems_8"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1710146030,
|
||||
|
|
@ -393,11 +402,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1726592409,
|
||||
"narHash": "sha256-2Y6CDvD/BD43WLS77PHu6dUHbdUfFhuzkY8oJAecD/U=",
|
||||
"lastModified": 1717527182,
|
||||
"narHash": "sha256-vWSkg6AMok1UUQiSYVdGMOXKD2cDFnajITiSi0Zjd1A=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "2ab00f89dd3ecf8012f5090e6d7ca1a7ea30f594",
|
||||
"rev": "845a5c4c073f74105022533907703441e0464bc3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -414,11 +423,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1726449931,
|
||||
"narHash": "sha256-1AX7MyYzP7sNgZiGF8jwehCCI75y2kBGwACeryJs+yE=",
|
||||
"lastModified": 1718011381,
|
||||
"narHash": "sha256-sFXI+ZANp/OC+MwfJoZgPSf4xMdtzQMe1pS3FGti4C8=",
|
||||
"owner": "Mic92",
|
||||
"repo": "nix-index-database",
|
||||
"rev": "c1b0fa0bec5478185eae2fd3f39b9e906fc83995",
|
||||
"rev": "88ad3d7501e22b2401dd72734b032b7baa794434",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -427,17 +436,87 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nix-software-center": {
|
||||
"inputs": {
|
||||
"nixos-appstream-data": "nixos-appstream-data",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"utils": "utils"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1714856183,
|
||||
"narHash": "sha256-Ue7xV+rZqImux4DDj3VMla4LIH2g8VeXbTJwgvX7wOo=",
|
||||
"owner": "vlinkz",
|
||||
"repo": "nix-software-center",
|
||||
"rev": "b9e0f53536e1e94e7d8c3cda3c6866b3f9d01386",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "vlinkz",
|
||||
"repo": "nix-software-center",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixos-appstream-data": {
|
||||
"inputs": {
|
||||
"flake-utils": [
|
||||
"nix-software-center",
|
||||
"utils"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"nix-software-center",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1712858390,
|
||||
"narHash": "sha256-XE7gr+zU3N4SHPAhsgk8cVAFp1iBg+Lxxp3y4dUF1vE=",
|
||||
"owner": "korfuri",
|
||||
"repo": "nixos-appstream-data",
|
||||
"rev": "0465d42a4433faa63b7a5eb0b8d397937c9fc13a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "korfuri",
|
||||
"ref": "flake",
|
||||
"repo": "nixos-appstream-data",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixos-conf-editor": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat_2",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"snowfall-lib": "snowfall-lib"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1707338010,
|
||||
"narHash": "sha256-UtLeZzDdk96sLTRcWsGrkWCslNUDytrGe0VmOTB/iig=",
|
||||
"owner": "vlinkz",
|
||||
"repo": "nixos-conf-editor",
|
||||
"rev": "27b5e92f580f794c690093503869aab242f075ab",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "vlinkz",
|
||||
"repo": "nixos-conf-editor",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixos-mailserver": {
|
||||
"inputs": {
|
||||
"blobs": "blobs",
|
||||
"flake-compat": "flake-compat_2",
|
||||
"flake-compat": "flake-compat_4",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"nixpkgs-24_05": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"utils": "utils"
|
||||
"utils": "utils_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1718084203,
|
||||
|
|
@ -456,11 +535,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1726447378,
|
||||
"narHash": "sha256-2yV8nmYE1p9lfmLHhOCbYwQC/W8WYfGQABoGzJOb1JQ=",
|
||||
"lastModified": 1718086528,
|
||||
"narHash": "sha256-hoB7B7oPgypePz16cKWawPfhVvMSXj4G/qLsfFuhFjw=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "086b448a5d54fd117f4dc2dee55c9f0ff461bdc1",
|
||||
"rev": "47b604b07d1e8146d5398b42d3306fdebd343986",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -510,12 +589,13 @@
|
|||
"dzgui-nix": "dzgui-nix",
|
||||
"home-manager": "home-manager",
|
||||
"nix-index-database": "nix-index-database",
|
||||
"nix-software-center": "nix-software-center",
|
||||
"nixos-conf-editor": "nixos-conf-editor",
|
||||
"nixos-mailserver": "nixos-mailserver",
|
||||
"nixpkgs": "nixpkgs",
|
||||
"plymouth-themes": "plymouth-themes",
|
||||
"ranger-icons": "ranger-icons",
|
||||
"tlauncher": "tlauncher",
|
||||
"warthunder-leak-counter": "warthunder-leak-counter",
|
||||
"wl-crosshair": "wl-crosshair"
|
||||
}
|
||||
},
|
||||
|
|
@ -563,6 +643,29 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"snowfall-lib": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat_3",
|
||||
"flake-utils-plus": "flake-utils-plus",
|
||||
"nixpkgs": [
|
||||
"nixos-conf-editor",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1696432959,
|
||||
"narHash": "sha256-oJQZv2MYyJaVyVJY5IeevzqpGvMGKu5pZcCCJvb+xjc=",
|
||||
"owner": "snowfallorg",
|
||||
"repo": "lib",
|
||||
"rev": "92803a029b5314d4436a8d9311d8707b71d9f0b6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "snowfallorg",
|
||||
"repo": "lib",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"systems": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
|
|
@ -668,9 +771,24 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"systems_8": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"tlauncher": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils_4",
|
||||
"flake-utils": "flake-utils_5",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
|
|
@ -693,6 +811,24 @@
|
|||
"inputs": {
|
||||
"systems": "systems_4"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1689068808,
|
||||
"narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"utils_2": {
|
||||
"inputs": {
|
||||
"systems": "systems_6"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1709126324,
|
||||
"narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=",
|
||||
|
|
@ -707,28 +843,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"warthunder-leak-counter": {
|
||||
"inputs": {
|
||||
"crane": "crane_2",
|
||||
"flake-utils": "flake-utils_5",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1719076817,
|
||||
"narHash": "sha256-B6NTomYXL50j6fabZrAGvTPp3zv5oFxNUhwvLhDNoMw=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "406d6646970191c016a375f25a35aa00dfa0d4aa",
|
||||
"revCount": 4,
|
||||
"type": "git",
|
||||
"url": "https://git.lelgenio.com/lelgenio/warthunder-leak-counter"
|
||||
},
|
||||
"original": {
|
||||
"type": "git",
|
||||
"url": "https://git.lelgenio.com/lelgenio/warthunder-leak-counter"
|
||||
}
|
||||
},
|
||||
"wl-crosshair": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils_6",
|
||||
|
|
|
|||
12
flake.nix
12
flake.nix
|
|
@ -29,7 +29,7 @@
|
|||
};
|
||||
|
||||
dzgui-nix = {
|
||||
url = "github:lelgenio/dzgui-nix/dzgui-4.1.0";
|
||||
url = "github:lelgenio/dzgui-nix";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
|
|
@ -54,8 +54,14 @@
|
|||
url = "github:lelgenio/wl-crosshair";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
warthunder-leak-counter = {
|
||||
url = "git+https://git.lelgenio.com/lelgenio/warthunder-leak-counter";
|
||||
|
||||
# gnome stuff
|
||||
nixos-conf-editor = {
|
||||
url = "github:vlinkz/nixos-conf-editor";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
nix-software-center = {
|
||||
url = "github:vlinkz/nix-software-center";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -23,7 +23,6 @@ in
|
|||
imports = [
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
./partition.nix
|
||||
./undervolt.nix
|
||||
];
|
||||
boot.initrd.availableKernelModules = [
|
||||
"nvme"
|
||||
|
|
@ -46,6 +45,9 @@ in
|
|||
boot.kernelParams = [
|
||||
"amdgpu.dcdebugmask=0x10" # amdgpu undervolting bug
|
||||
"video=DP-1:1920x1080@144"
|
||||
# hibernation
|
||||
# "resume=LABEL=BTRFS_ROOT" # findmnt -o LABEL --noheadings /swap/
|
||||
# "resume_offset=36709632" # btrfs inspect-internal map-swapfile -r /swap/swapfile
|
||||
];
|
||||
systemd.sleep.extraConfig = ''
|
||||
HibernateDelaySec=30s
|
||||
|
|
@ -65,26 +67,36 @@ in
|
|||
rocmPackages.rocm-smi
|
||||
];
|
||||
|
||||
fileSystems."/mnt/old" = {
|
||||
device = "/dev/disk/by-label/BTRFS_ROOT";
|
||||
fsType = "btrfs";
|
||||
options = [ "nofail" ] ++ btrfs_options ++ btrfs_ssd;
|
||||
};
|
||||
# boot.initrd.luks.reusePassphrases = true;
|
||||
boot.initrd.luks.devices = {
|
||||
"old" = {
|
||||
bypassWorkqueues = true;
|
||||
device = "/dev/disk/by-label/CRYPT_ROOT";
|
||||
boot.kernelPackages = pkgs.linuxPackages_6_1;
|
||||
|
||||
programs.corectrl = {
|
||||
enable = true;
|
||||
gpuOverclock = {
|
||||
enable = true;
|
||||
ppfeaturemask = "0xffffffff";
|
||||
};
|
||||
"data" = {
|
||||
bypassWorkqueues = true;
|
||||
device = "/dev/disk/by-label/CRYPT_DATA";
|
||||
};
|
||||
# "bigboy" = {
|
||||
# bypassWorkqueues = true;
|
||||
# device = "/dev/disk/by-label/CRYPT_BIGBOY";
|
||||
# };
|
||||
};
|
||||
|
||||
# fileSystems."/" = {
|
||||
# device = "/dev/disk/by-label/BTRFS_ROOT";
|
||||
# fsType = "btrfs";
|
||||
# options = [ "subvol=nixos" ] ++ btrfs_options ++ btrfs_ssd;
|
||||
# };
|
||||
# # boot.initrd.luks.reusePassphrases = true;
|
||||
# boot.initrd.luks.devices = {
|
||||
# "main" = {
|
||||
# bypassWorkqueues = true;
|
||||
# device = "/dev/disk/by-label/CRYPT_ROOT";
|
||||
# };
|
||||
# "data" = {
|
||||
# bypassWorkqueues = true;
|
||||
# device = "/dev/disk/by-label/CRYPT_DATA";
|
||||
# };
|
||||
# "bigboy" = {
|
||||
# bypassWorkqueues = true;
|
||||
# device = "/dev/disk/by-label/CRYPT_BIGBOY";
|
||||
# };
|
||||
# };
|
||||
# boot.loader.efi.efiSysMountPoint = "/boot/efi";
|
||||
# fileSystems."/boot/efi" = {
|
||||
# device = "/dev/disk/by-label/NIXBOOT";
|
||||
|
|
@ -95,43 +107,43 @@ in
|
|||
# fsType = "btrfs";
|
||||
# options = [ "subvol=home" ] ++ btrfs_options ++ btrfs_ssd;
|
||||
# };
|
||||
fileSystems."/home/lelgenio/Games" = {
|
||||
device = "/dev/disk/by-label/BTRFS_DATA";
|
||||
fsType = "btrfs";
|
||||
options = [
|
||||
"subvol=@games"
|
||||
"nofail"
|
||||
] ++ btrfs_options;
|
||||
};
|
||||
fileSystems."/home/lelgenio/Downloads/Torrents" = {
|
||||
device = "/dev/disk/by-label/BTRFS_DATA";
|
||||
fsType = "btrfs";
|
||||
options = [
|
||||
"subvol=@torrents"
|
||||
"nofail"
|
||||
] ++ btrfs_options;
|
||||
};
|
||||
fileSystems."/home/lelgenio/Música" = {
|
||||
device = "/dev/disk/by-label/BTRFS_DATA";
|
||||
fsType = "btrfs";
|
||||
options = [
|
||||
"subvol=@music"
|
||||
"nofail"
|
||||
] ++ btrfs_options;
|
||||
};
|
||||
fileSystems."/home/lelgenio/.local/mount/data" = {
|
||||
device = "/dev/disk/by-label/BTRFS_DATA";
|
||||
fsType = "btrfs";
|
||||
options = [
|
||||
"subvol=@data"
|
||||
"nofail"
|
||||
] ++ btrfs_options;
|
||||
};
|
||||
fileSystems."/home/lelgenio/.local/mount/old" = {
|
||||
device = "/dev/disk/by-label/BTRFS_ROOT";
|
||||
fsType = "btrfs";
|
||||
options = [ "nofail" ] ++ btrfs_options ++ btrfs_ssd;
|
||||
};
|
||||
# fileSystems."/home/lelgenio/Games" = {
|
||||
# device = "/dev/disk/by-label/BTRFS_DATA";
|
||||
# fsType = "btrfs";
|
||||
# options = [
|
||||
# "subvol=@games"
|
||||
# "nofail"
|
||||
# ] ++ btrfs_options;
|
||||
# };
|
||||
# fileSystems."/home/lelgenio/Downloads/Torrents" = {
|
||||
# device = "/dev/disk/by-label/BTRFS_DATA";
|
||||
# fsType = "btrfs";
|
||||
# options = [
|
||||
# "subvol=@torrents"
|
||||
# "nofail"
|
||||
# ] ++ btrfs_options;
|
||||
# };
|
||||
# fileSystems."/home/lelgenio/Música" = {
|
||||
# device = "/dev/disk/by-label/BTRFS_DATA";
|
||||
# fsType = "btrfs";
|
||||
# options = [
|
||||
# "subvol=@music"
|
||||
# "nofail"
|
||||
# ] ++ btrfs_options;
|
||||
# };
|
||||
# fileSystems."/home/lelgenio/.local/mount/data" = {
|
||||
# device = "/dev/disk/by-label/BTRFS_DATA";
|
||||
# fsType = "btrfs";
|
||||
# options = [
|
||||
# "subvol=@data"
|
||||
# "nofail"
|
||||
# ] ++ btrfs_options;
|
||||
# };
|
||||
# fileSystems."/home/lelgenio/.local/mount/bigboy" = {
|
||||
# device = "/dev/disk/by-label/BTRFS_BIGBOY";
|
||||
# fsType = "btrfs";
|
||||
# options = [ "nofail" ] ++ btrfs_options ++ btrfs_ssd;
|
||||
# };
|
||||
|
||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||
|
|
@ -143,8 +155,6 @@ in
|
|||
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
networking.hostName = "monolith"; # Define your hostname.
|
||||
|
||||
virtualisation.virtualbox.host.enable = true;
|
||||
|
||||
services.udev.extraRules = ''
|
||||
# Fix broken suspend with Logitech USB dongle
|
||||
# `lsusb | grep Logitech` will return "vendor:product"
|
||||
|
|
@ -154,11 +164,6 @@ in
|
|||
ACTION=="add|change", KERNEL=="sd[a-z]*[0-9]*|mmcblk[0-9]*p[0-9]*|nvme[0-9]*n[0-9]*p[0-9]*", ATTR{../queue/scheduler}="mq-deadline"
|
||||
'';
|
||||
|
||||
boot.tmp = {
|
||||
cleanOnBoot = true;
|
||||
useTmpfs = true;
|
||||
};
|
||||
|
||||
# swap
|
||||
# fileSystems."/swap" = {
|
||||
# device = "/dev/disk/by-label/BTRFS_ROOT";
|
||||
|
|
|
|||
|
|
@ -1,18 +0,0 @@
|
|||
{ pkgs, ... }:
|
||||
let
|
||||
undervoltGpu = pkgs.writeShellScript "undervolt-gpu" ''
|
||||
set -xe
|
||||
cd $1
|
||||
echo "manual" > power_dpm_force_performance_level
|
||||
echo "1" > pp_power_profile_mode
|
||||
test -e pp_od_clk_voltage
|
||||
echo "vo -100" > pp_od_clk_voltage
|
||||
echo "c" > pp_od_clk_voltage
|
||||
'';
|
||||
in
|
||||
{
|
||||
boot.kernelParams = [ "amdgpu.ppfeaturemask=0xfffd7fff" ];
|
||||
services.udev.extraRules = ''
|
||||
ACTION=="add", SUBSYSTEM=="hwmon", ATTR{name}=="amdgpu", ATTR{power1_cap}="186000000", RUN+="${undervoltGpu} %S%p/device"
|
||||
'';
|
||||
}
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
{ pkgs, ... }:
|
||||
{
|
||||
users.users.davikiwi = {
|
||||
isNormalUser = true;
|
||||
description = "Davi";
|
||||
hashedPassword = "$y$j9T$0e/rczjOVCy7PuwC3pG0V/$gTHZhfO4wQSlFvbDyfghbCnGI2uDI0a52zSrQ/yOA5A";
|
||||
openssh.authorizedKeys.keys = [
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGgZDBnj+gVMHqoNvjpx2T/HqnxUDbLPshu+t7301gXd Davi@DESKTOP-EVHFGJ9"
|
||||
];
|
||||
extraGroups = [ "docker" ];
|
||||
packages = with pkgs; [
|
||||
(pkgs.python3.withPackages (python-pkgs: [
|
||||
python-pkgs.pip
|
||||
python-pkgs.wheel
|
||||
]))
|
||||
];
|
||||
};
|
||||
|
||||
services.nginx.virtualHosts."davikiwi.lelgenio.com" = {
|
||||
enableACME = true;
|
||||
forceSSL = true;
|
||||
locations."/" = {
|
||||
proxyPass = "http://127.0.0.1:24618";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -18,9 +18,6 @@
|
|||
./writefreely.nix
|
||||
./email.nix
|
||||
./forgejo.nix
|
||||
./warthunder-leak-counter.nix
|
||||
./invidious.nix
|
||||
./davi.nix
|
||||
];
|
||||
|
||||
networking.hostName = "phantom";
|
||||
|
|
@ -56,11 +53,6 @@
|
|||
identityPaths = [ "/root/.ssh/id_rsa" ];
|
||||
};
|
||||
|
||||
nix.settings = {
|
||||
cores = 1;
|
||||
max-jobs = 1;
|
||||
};
|
||||
|
||||
system.autoUpgrade = {
|
||||
enable = true;
|
||||
dates = "04:40";
|
||||
|
|
@ -69,7 +61,7 @@
|
|||
"--update-input"
|
||||
"nixpkgs"
|
||||
"--no-write-lock-file"
|
||||
"--print-build-logs"
|
||||
"-L"
|
||||
];
|
||||
flake = "git+https://git.lelgenio.com/lelgenio/nixos-config#phantom";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -13,6 +13,9 @@ in
|
|||
virtualHosts.${cfg.settings.server.DOMAIN} = {
|
||||
forceSSL = true;
|
||||
enableACME = true;
|
||||
extraConfig = ''
|
||||
client_max_body_size 512M;
|
||||
'';
|
||||
locations."/".proxyPass = "http://localhost:${toString srv.HTTP_PORT}";
|
||||
};
|
||||
};
|
||||
|
|
@ -34,7 +37,7 @@ in
|
|||
};
|
||||
mailer = {
|
||||
ENABLED = true;
|
||||
SMTP_ADDR = "lelgenio.com";
|
||||
SMTP_ADDR = "mail.lelgenio.com";
|
||||
FROM = "noreply@git.lelgenio.com";
|
||||
USER = "noreply@git.lelgenio.com";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,12 +0,0 @@
|
|||
{
|
||||
services.invidious = {
|
||||
enable = true;
|
||||
domain = "invidious.lelgenio.com";
|
||||
nginx.enable = true;
|
||||
port = 10601;
|
||||
settings.db = {
|
||||
user = "invidious";
|
||||
dbname = "invidious";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -18,7 +18,7 @@
|
|||
};
|
||||
streamingProcesses = 2;
|
||||
extraConfig.SINGLE_USER_MODE = "true";
|
||||
mediaAutoRemove.olderThanDays = 5;
|
||||
mediaAutoRemove.olderThanDays = 10;
|
||||
};
|
||||
|
||||
age.secrets.phantom-mastodon-mailer-password = {
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@
|
|||
recommendedTlsSettings = true;
|
||||
recommendedOptimisation = true;
|
||||
recommendedGzipSettings = true;
|
||||
clientMaxBodySize = "512M";
|
||||
};
|
||||
|
||||
# Redirect *lelgenio.xyz -> *lelgenio.com
|
||||
|
|
|
|||
|
|
@ -40,7 +40,6 @@
|
|||
];
|
||||
initialHashedPassword = "$y$j9T$E3aBBSSq0Gma8hZD9L7ov0$iCGDW4fqrXWfHO0qodBYYgMFA9CpIraoklHcPbJJrM3";
|
||||
};
|
||||
|
||||
security.sudo.wheelNeedsPassword = false;
|
||||
|
||||
programs.fish.enable = true;
|
||||
|
|
|
|||
|
|
@ -1,19 +0,0 @@
|
|||
{
|
||||
inputs,
|
||||
pkgs,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
{
|
||||
imports = [ inputs.warthunder-leak-counter.nixosModules.default ];
|
||||
|
||||
services.warthunder-leak-counter.enable = true;
|
||||
|
||||
services.nginx.virtualHosts."warthunder-leak-counter.lelgenio.com" = {
|
||||
enableACME = true;
|
||||
forceSSL = true;
|
||||
locations."/" = {
|
||||
proxyPass = "http://127.0.0.1:${toString config.services.warthunder-leak-counter.port}";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -48,8 +48,6 @@ rec {
|
|||
patches = (
|
||||
final: prev: {
|
||||
mySway = prev.sway.override {
|
||||
withBaseWrapper = true;
|
||||
withGtkWrapper = true;
|
||||
sway-unwrapped = prev.sway-unwrapped.overrideAttrs (old: {
|
||||
patches = old.patches ++ [ ../patches/sway/fix-hide_cursor-clearing-focus.patch ];
|
||||
});
|
||||
|
|
|
|||
|
|
@ -2,12 +2,10 @@
|
|||
# You can build them using 'nix build .#example' or (legacy) 'nix-build -A example'
|
||||
|
||||
{ pkgs, inputs }:
|
||||
rec {
|
||||
{
|
||||
blade-formatter = pkgs.callPackage ./blade-formatter { };
|
||||
cargo-checkmate = pkgs.callPackage ./cargo-checkmate.nix { };
|
||||
lipsum = pkgs.callPackage ./lipsum.nix { };
|
||||
emmet-cli = pkgs.callPackage ./emmet-cli.nix { };
|
||||
material-wifi-icons = pkgs.callPackage ./material-wifi-icons.nix { };
|
||||
gnome-pass-search-provider = pkgs.callPackage ./gnome-pass-search-provider.nix { };
|
||||
kak-tree-sitter = pkgs.callPackage ./kak-tree-sitter.nix { };
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,64 +0,0 @@
|
|||
{
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
python3Packages,
|
||||
wrapGAppsHook,
|
||||
gtk3,
|
||||
gobject-introspection,
|
||||
gnome,
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (python3Packages)
|
||||
dbus-python
|
||||
pygobject3
|
||||
fuzzywuzzy
|
||||
levenshtein
|
||||
;
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-pass-search-provider";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jle64";
|
||||
repo = "gnome-pass-search-provider";
|
||||
rev = version;
|
||||
hash = "sha256-PDR8fbDoT8IkHiTopQp0zd4DQg7JlacA6NdKYKYmrWw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
python3Packages.wrapPython
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dbus-python
|
||||
pygobject3
|
||||
fuzzywuzzy
|
||||
levenshtein
|
||||
|
||||
gtk3
|
||||
gobject-introspection
|
||||
];
|
||||
|
||||
env = {
|
||||
LIBDIR = builtins.placeholder "out" + "/lib";
|
||||
DATADIR = builtins.placeholder "out" + "/share";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace conf/org.gnome.Pass.SearchProvider.service.{dbus,systemd} \
|
||||
--replace-fail "/usr/lib" "$LIBDIR"
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
bash ./install.sh
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
makeWrapperArgs=( "''${gappsWrapperArgs[@]}" )
|
||||
wrapPythonProgramsIn "$out/lib" "$out $propagatedBuildInputs"
|
||||
'';
|
||||
}
|
||||
|
|
@ -1,34 +0,0 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
rustPlatform,
|
||||
fetchFromSourcehut,
|
||||
makeWrapper,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "kak-tree-sitter";
|
||||
version = "1.1.2";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~hadronized";
|
||||
repo = "kak-tree-sitter";
|
||||
rev = "kak-tree-sitter-v${version}";
|
||||
hash = "sha256-wBWfSyR8LGtug/mCD0bJ4lbdN3trIA/03AnCxZoEOSA=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-OQPUWqJAts8DbFNSsC/CmMCbuZ9TVxRTR05O7oiodKI=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
postFixup = ''
|
||||
wrapProgram "$out/bin/ktsctl" \
|
||||
--suffix PATH : ${stdenv.cc}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Server that interfaces tree-sitter with kakoune";
|
||||
homepage = "https://git.sr.ht/~hadronized/kak-tree-sitter";
|
||||
license = with licenses; [ mit ];
|
||||
};
|
||||
}
|
||||
0
scripts/_diffr
Executable file → Normal file
0
scripts/_diffr
Executable file → Normal file
0
scripts/_sway_idle_toggle
Executable file → Normal file
0
scripts/_sway_idle_toggle
Executable file → Normal file
26
scripts/auto_connect_gamepad
Executable file
26
scripts/auto_connect_gamepad
Executable file
|
|
@ -0,0 +1,26 @@
|
|||
#!/bin/sh
|
||||
|
||||
list_paired_controllers() {
|
||||
bluetoothctl devices Paired | grep -i 'controller' | cut -d' ' -f2
|
||||
}
|
||||
|
||||
count_connected_controllers() {
|
||||
bluetoothctl devices Connected | grep -i 'controller' | wc -l
|
||||
}
|
||||
|
||||
try_to_connect_to_all_controllers() {
|
||||
list_paired_controllers | while read paired_controller; do
|
||||
echo "Trying to connect to controller $paired_controller"
|
||||
bluetoothctl connect "$paired_controller"
|
||||
done
|
||||
}
|
||||
|
||||
while true; do
|
||||
echo "looping"
|
||||
if test "$(count_connected_controllers)" -ne 0 ; then
|
||||
echo "there is a controller connected, not attempting to connect to any other"
|
||||
sleep 10s
|
||||
continue
|
||||
fi
|
||||
try_to_connect_to_all_controllers
|
||||
done
|
||||
0
scripts/bmenu
Executable file → Normal file
0
scripts/bmenu
Executable file → Normal file
0
scripts/br
Executable file → Normal file
0
scripts/br
Executable file → Normal file
|
|
@ -1,32 +1,34 @@
|
|||
(
|
||||
final: prev:
|
||||
with prev;
|
||||
let
|
||||
lib = prev.lib;
|
||||
|
||||
importScript = (_: path: import (path) { inherit (final) pkgs lib; });
|
||||
wrapScript =
|
||||
import_script = (_: path: import (path) { inherit pkgs lib; });
|
||||
create_script = (
|
||||
name: text: runtimeInputs:
|
||||
final.runCommand name
|
||||
{
|
||||
nativeBuildInputs = [ final.makeWrapper ];
|
||||
meta.mainProgram = name;
|
||||
}
|
||||
''
|
||||
mkdir -p $out/bin
|
||||
cp ${text} $out/bin/${name}
|
||||
wrapProgram $out/bin/${name} \
|
||||
--suffix PATH : ${lib.makeBinPath runtimeInputs}
|
||||
'';
|
||||
createScripts = lib.mapAttrs (name: deps: wrapScript name ./${name} deps);
|
||||
let
|
||||
script_body = pkgs.writeTextFile {
|
||||
inherit name;
|
||||
executable = true;
|
||||
text = ''
|
||||
${builtins.readFile text}
|
||||
'';
|
||||
};
|
||||
in
|
||||
(pkgs.writeShellApplication {
|
||||
inherit name runtimeInputs;
|
||||
text = ''exec ${script_body} "$@"'';
|
||||
checkPhase = "";
|
||||
})
|
||||
);
|
||||
create_scripts = lib.mapAttrs (name: deps: create_script name ./${name} deps);
|
||||
|
||||
myPass = final.pass.withExtensions (ex: with ex; [ pass-otp ]);
|
||||
pass = pkgs.pass.withExtensions (ex: with ex; [ pass-otp ]);
|
||||
in
|
||||
with final;
|
||||
createScripts {
|
||||
create_scripts {
|
||||
br = [ ];
|
||||
bmenu = [
|
||||
bemenu
|
||||
dhist
|
||||
final.bemenu
|
||||
final.dhist
|
||||
fish
|
||||
j4-dmenu-desktop
|
||||
jq
|
||||
|
|
@ -42,21 +44,21 @@
|
|||
fish
|
||||
];
|
||||
_diffr = [ diffr ];
|
||||
_thunar-terminal = [ terminal ];
|
||||
_sway_idle_toggle = [ swayidle ];
|
||||
_thunar-terminal = [ final.terminal ];
|
||||
_sway_idle_toggle = [ final.swayidle ];
|
||||
kak-pager = [
|
||||
fish
|
||||
_diffr
|
||||
final._diffr
|
||||
];
|
||||
kak-man-pager = [ kak-pager ];
|
||||
kak-man-pager = [ final.kak-pager ];
|
||||
helix-pager = [
|
||||
fish
|
||||
_diffr
|
||||
final._diffr
|
||||
];
|
||||
helix-man-pager = [ helix-pager ];
|
||||
helix-man-pager = [ final.helix-pager ];
|
||||
musmenu = [
|
||||
mpc-cli
|
||||
wdmenu
|
||||
final.wdmenu
|
||||
trash-cli
|
||||
xdg-user-dirs
|
||||
libnotify
|
||||
|
|
@ -69,12 +71,11 @@
|
|||
pass-export = [
|
||||
pass2csv
|
||||
gnupg
|
||||
sd
|
||||
];
|
||||
wpass = [
|
||||
wdmenu
|
||||
final.wdmenu
|
||||
fd
|
||||
myPass
|
||||
pass
|
||||
sd
|
||||
wl-clipboard
|
||||
wtype
|
||||
|
|
@ -95,7 +96,7 @@
|
|||
pulse_sink = [
|
||||
pulseaudio
|
||||
pamixer
|
||||
wdmenu
|
||||
final.wdmenu
|
||||
];
|
||||
color_picker = [
|
||||
grim
|
||||
|
|
@ -107,13 +108,13 @@
|
|||
dzadd = [
|
||||
procps
|
||||
libnotify
|
||||
wdmenu
|
||||
final.wdmenu
|
||||
jq
|
||||
mpv
|
||||
pqiv
|
||||
python3Packages.deemix
|
||||
mpc-cli
|
||||
mpdDup
|
||||
final.mpdDup
|
||||
];
|
||||
mpdDup = [
|
||||
mpc-cli
|
||||
|
|
@ -124,13 +125,14 @@
|
|||
zbar
|
||||
wl-clipboard
|
||||
];
|
||||
powerplay-led-idle = [
|
||||
bash
|
||||
libinput
|
||||
libratbag
|
||||
auto_connect_gamepad = [
|
||||
bluez
|
||||
coreutils
|
||||
gnugrep
|
||||
];
|
||||
vrr-fullscreen = [ ];
|
||||
}
|
||||
// lib.mapAttrs importScript {
|
||||
// lib.mapAttrs import_script {
|
||||
wdmenu = ./wdmenu.nix;
|
||||
wlauncher = ./wlauncher.nix;
|
||||
_gpg-unlock = ./_gpg-unlock.nix;
|
||||
|
|
|
|||
0
scripts/helix-pager
Executable file → Normal file
0
scripts/helix-pager
Executable file → Normal file
0
scripts/kak-pager
Executable file → Normal file
0
scripts/kak-pager
Executable file → Normal file
|
|
@ -8,6 +8,3 @@ pass2csv "$PASSWORD_STORE_DIR" "$HOME/passwords.csv" \
|
|||
-f User '(user|login)(:\s*)?' \
|
||||
-f TOTP 'otpauth(:)?' \
|
||||
-f URL 'url(:\s*)?'
|
||||
|
||||
# Fix TOTP format for keepass
|
||||
sd '"//totp/.*?secret=(.*?)(&.*?)?"' '"$1"' "$HOME/passwords.csv"
|
||||
0
scripts/playerctl-status
Executable file → Normal file
0
scripts/playerctl-status
Executable file → Normal file
|
|
@ -1,79 +0,0 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
set -e
|
||||
|
||||
# Constants
|
||||
SECONDS_UNTIL_FADE=$(( 1 * 60))
|
||||
SECONDS_UNTIL_OFF=$(( 6 * 60))
|
||||
|
||||
COLOR_ON=ff0000
|
||||
COLOR_FADE=880000
|
||||
COLOR_OFF=000000
|
||||
|
||||
# Logging
|
||||
|
||||
if [[ "$1" = "debug" ]]; then
|
||||
echo "Running with debugging" >&2
|
||||
DEBUG="true"
|
||||
|
||||
SECONDS_UNTIL_FADE=$(( 3 ))
|
||||
SECONDS_UNTIL_OFF=$(( 5 ))
|
||||
fi
|
||||
|
||||
log() {
|
||||
if [[ "$DEBUG" = "true" ]]; then
|
||||
echo "$@" >&2
|
||||
fi
|
||||
}
|
||||
|
||||
# Implementation
|
||||
|
||||
main() {
|
||||
CURRENT_STATE="UNKNOWN"
|
||||
LAST_POINTER_MOTION="$(date +%s)"
|
||||
|
||||
if [ "$(ratbagctl list | wc -l)" -ne 1 ]; then
|
||||
echo "Not exactly one device found, exiting..."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
DEVICE="$(ratbagctl list | cut -d: -f1)"
|
||||
|
||||
while true; do
|
||||
while read line; do
|
||||
LAST_POINTER_MOTION="$(date +%s)"
|
||||
break
|
||||
done < <(
|
||||
timeout 5s \
|
||||
libinput debug-events \
|
||||
| grep POINTER_MOTION
|
||||
)
|
||||
TIME_SINCE_LAST=$(( "$(date +%s)" - "$LAST_POINTER_MOTION" ))
|
||||
log "Last pointer motion was $TIME_SINCE_LAST seconds ago"
|
||||
if [ "$TIME_SINCE_LAST" -gt "$SECONDS_UNTIL_OFF" ]; then
|
||||
setState OFF "$COLOR_OFF"
|
||||
elif [ "$TIME_SINCE_LAST" -gt "$SECONDS_UNTIL_FADE" ]; then
|
||||
setState FADE "$COLOR_FADE"
|
||||
else
|
||||
setState ON "$COLOR_ON"
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
setState() {
|
||||
STATE="$1"
|
||||
COLOR="$2"
|
||||
MODE="$3"
|
||||
|
||||
if [[ "$STATE" = "$CURRENT_STATE" ]]; then
|
||||
log "Already in $STATE state"
|
||||
return
|
||||
fi
|
||||
log "Changing state to $STATE"
|
||||
CURRENT_STATE="$STATE"
|
||||
|
||||
ratbagctl "$DEVICE" led 0 set mode on
|
||||
ratbagctl "$DEVICE" led 0 set color "$COLOR"
|
||||
}
|
||||
|
||||
main
|
||||
0
scripts/pulse_sink
Executable file → Normal file
0
scripts/pulse_sink
Executable file → Normal file
0
scripts/screenshotsh
Executable file → Normal file
0
scripts/screenshotsh
Executable file → Normal file
0
scripts/showkeys
Executable file → Normal file
0
scripts/showkeys
Executable file → Normal file
0
scripts/terminal
Executable file → Normal file
0
scripts/terminal
Executable file → Normal file
28
scripts/vrr-fullscreen
Executable file
28
scripts/vrr-fullscreen
Executable file
|
|
@ -0,0 +1,28 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
# List of supported outputs for VRR
|
||||
output_vrr_whitelist=(
|
||||
"DP-1"
|
||||
"DP-2"
|
||||
)
|
||||
|
||||
# Toggle VRR for fullscreened apps in prespecified displays to avoid stutters while in desktop
|
||||
swaymsg -t subscribe -m '[ "window" ]' | while read window_json; do
|
||||
window_event=$(echo ${window_json} | jq -r '.change')
|
||||
|
||||
# Process only focus change and fullscreen toggle
|
||||
if [[ $window_event = "focus" || $window_event = "fullscreen_mode" ]]; then
|
||||
output_json=$(swaymsg -t get_outputs | jq -r '.[] | select(.focused == true)')
|
||||
output_name=$(echo ${output_json} | jq -r '.name')
|
||||
|
||||
# Use only VRR in whitelisted outputs
|
||||
if [[ ${output_vrr_whitelist[*]} =~ ${output_name} ]]; then
|
||||
output_vrr_status=$(echo ${output_json} | jq -r '.adaptive_sync_status')
|
||||
window_fullscreen_status=$(echo ${window_json} | jq -r '.container.fullscreen_mode')
|
||||
|
||||
# Only update output if nesseccary to avoid flickering
|
||||
[[ $output_vrr_status = "disabled" && $window_fullscreen_status = "1" ]] && swaymsg output "${output_name}" adaptive_sync 1
|
||||
[[ $output_vrr_status = "enabled" && $window_fullscreen_status = "0" ]] && swaymsg output "${output_name}" adaptive_sync 0
|
||||
fi
|
||||
fi
|
||||
done
|
||||
0
scripts/wl-copy-file
Executable file → Normal file
0
scripts/wl-copy-file
Executable file → Normal file
0
scripts/wpass
Executable file → Normal file
0
scripts/wpass
Executable file → Normal file
Binary file not shown.
Binary file not shown.
|
|
@ -6,7 +6,7 @@
|
|||
settings = {
|
||||
General = {
|
||||
DiscoverableTimeout = 0;
|
||||
Discoverable = true;
|
||||
# Discoverable = true;
|
||||
AlwaysPairable = true;
|
||||
};
|
||||
Policy = {
|
||||
|
|
|
|||
|
|
@ -18,7 +18,6 @@
|
|||
./fonts.nix
|
||||
./sound.nix
|
||||
./bluetooth.nix
|
||||
./mouse.nix
|
||||
./locale.nix
|
||||
./users.nix
|
||||
./containers.nix
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ pkgs, lib, ... }:
|
||||
{
|
||||
mkNixRunner =
|
||||
authenticationTokenConfigFile: with lib; rec {
|
||||
registrationConfigFile: with lib; rec {
|
||||
# File should contain at least these two variables:
|
||||
# `CI_SERVER_URL`
|
||||
# `REGISTRATION_TOKEN`
|
||||
inherit authenticationTokenConfigFile; # 2
|
||||
inherit registrationConfigFile; # 2
|
||||
dockerImage = "alpine:3.18.2";
|
||||
dockerAllowedImages = [ dockerImage ];
|
||||
dockerVolumes = [
|
||||
|
|
@ -47,5 +47,6 @@
|
|||
PATH = "/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/default/sbin:/bin:/sbin:/usr/bin:/usr/sbin";
|
||||
NIX_SSL_CERT_FILE = "/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt";
|
||||
};
|
||||
tagList = [ "nix" ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -30,8 +30,6 @@
|
|||
|
||||
hardware.opentabletdriver.enable = lib.mkForce false;
|
||||
|
||||
programs.gpaste.enable = true;
|
||||
|
||||
# services.xserver.displayManager.autologin.user = "lelgenio";
|
||||
environment.systemPackages =
|
||||
with pkgs;
|
||||
|
|
@ -42,6 +40,5 @@
|
|||
|
||||
chrome-gnome-shell
|
||||
gnomeExtensions.quick-settings-audio-devices-hider
|
||||
gnome-pass-search-provider
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,7 +23,6 @@ in
|
|||
gimp
|
||||
inkscape
|
||||
krita
|
||||
kdePackages.breeze
|
||||
kdePackages.kdenlive
|
||||
pitivi
|
||||
blender-hip
|
||||
|
|
|
|||
|
|
@ -14,6 +14,18 @@ in
|
|||
enable = true;
|
||||
settings.concurrent = 4;
|
||||
services = {
|
||||
# ci_test = {
|
||||
# registrationConfigFile = "/srv/gitlab-runner/env/ci_test";
|
||||
# dockerImage = "debian";
|
||||
# dockerPrivileged = true;
|
||||
# };
|
||||
thoreb_builder = {
|
||||
registrationConfigFile =
|
||||
config.age.secrets.monolith-gitlab-runner-thoreb-itinerario-registrationConfigFile.path;
|
||||
dockerImage = "debian";
|
||||
dockerPrivileged = true;
|
||||
};
|
||||
|
||||
# runner for building in docker via host's nix-daemon
|
||||
# nix store will be readable in runner, might be insecure
|
||||
thoreb-telemetria-nix = mkNixRunner config.age.secrets.gitlab-runner-thoreb-telemetria-registrationConfigFile.path;
|
||||
|
|
|
|||
|
|
@ -1,15 +0,0 @@
|
|||
{
|
||||
# Allow configuring Logitech Peripherals
|
||||
services.ratbagd.enable = true;
|
||||
|
||||
# Sway does not undersand high resolution scroll wheels
|
||||
# I don't need this, so I disable it
|
||||
environment.etc."libinput/local-overrides.quirks".text = ''
|
||||
[Logitech G502 X PLUS]
|
||||
MatchUdevType=mouse
|
||||
MatchBus=usb
|
||||
MatchVendor=0x046D
|
||||
MatchProduct=0x4099
|
||||
AttrEventCode=-REL_WHEEL_HI_RES
|
||||
'';
|
||||
}
|
||||
|
|
@ -9,11 +9,6 @@
|
|||
# Open kde connect ports
|
||||
programs.kdeconnect.enable = true;
|
||||
|
||||
networking.firewall = {
|
||||
enable = true;
|
||||
logRefusedConnections = false;
|
||||
};
|
||||
|
||||
# Enable CUPS to print documents.
|
||||
# services.printing.enable = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -6,28 +6,23 @@
|
|||
}:
|
||||
{
|
||||
programs.steam.enable = true;
|
||||
programs.steam.extraPackages =
|
||||
config.fonts.packages
|
||||
++ (with pkgs; [
|
||||
capitaine-cursors
|
||||
bibata-cursors
|
||||
mangohud
|
||||
xdg-user-dirs
|
||||
gamescope
|
||||
|
||||
# gamescope compatibility??
|
||||
xorg.libXcursor
|
||||
xorg.libXi
|
||||
xorg.libXinerama
|
||||
xorg.libXScrnSaver
|
||||
libpng
|
||||
libpulseaudio
|
||||
libvorbis
|
||||
stdenv.cc.cc.lib
|
||||
libkrb5
|
||||
keyutils
|
||||
]);
|
||||
programs.steam.package = pkgs.steam.override {
|
||||
extraLibraries =
|
||||
pkgs:
|
||||
with config.hardware.opengl;
|
||||
if pkgs.hostPlatform.is64bit then
|
||||
[ package ] ++ extraPackages
|
||||
else
|
||||
[ package32 ] ++ extraPackages32;
|
||||
|
||||
extraPkgs =
|
||||
pkgs: with pkgs; [
|
||||
capitaine-cursors
|
||||
bibata-cursors
|
||||
mangohud
|
||||
xdg-user-dirs
|
||||
];
|
||||
};
|
||||
environment.systemPackages = with pkgs; [
|
||||
protontricks
|
||||
bottles
|
||||
|
|
|
|||
|
|
@ -19,7 +19,6 @@
|
|||
"bluetooth"
|
||||
"corectrl"
|
||||
"vboxusers"
|
||||
"input"
|
||||
];
|
||||
shell = pkgs.fish;
|
||||
openssh.authorizedKeys.keys = [
|
||||
|
|
|
|||
|
|
@ -116,12 +116,6 @@ in
|
|||
mode = "Vi|~Search";
|
||||
action = "SearchNext";
|
||||
}
|
||||
{
|
||||
key = lib.toUpper key.next;
|
||||
mods = "Shift";
|
||||
mode = "Vi|~Search";
|
||||
action = "SearchPrevious";
|
||||
}
|
||||
{
|
||||
key = "Up";
|
||||
mods = "Control|Shift";
|
||||
|
|
|
|||
|
|
@ -9,14 +9,14 @@
|
|||
wayland.windowManager.sway = {
|
||||
extraConfig = ''
|
||||
exec thunderbird
|
||||
exec vesktop
|
||||
exec webcord
|
||||
exec telegram-desktop
|
||||
'';
|
||||
};
|
||||
|
||||
home.packages = with pkgs; [
|
||||
tdesktop
|
||||
vesktop
|
||||
webcord
|
||||
thunderbird
|
||||
element-desktop-wayland
|
||||
];
|
||||
|
|
|
|||
26
user/controller.nix
Normal file
26
user/controller.nix
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
{ pkgs, lib, ... }:
|
||||
{
|
||||
systemd.user.services = {
|
||||
autoconnect-gamepad = {
|
||||
Unit = {
|
||||
Description = "Attempt to connect to game controllers";
|
||||
PartOf = [ "graphical-session.target" ];
|
||||
After = [ "graphical-session.target" ];
|
||||
};
|
||||
Service = {
|
||||
ExecStart = lib.getExe pkgs.auto_connect_gamepad;
|
||||
};
|
||||
Install = {
|
||||
WantedBy = [ "sway-session.target" ];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
xdg.desktopEntries = {
|
||||
disconnect-controller = {
|
||||
name = "Disconnect Controller";
|
||||
exec = "bluetoothctl disconnect 84:30:95:97:1A:79";
|
||||
terminal = false;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -7,7 +7,7 @@
|
|||
}:
|
||||
let
|
||||
inherit (config.my) desktop browser;
|
||||
bugfixedFirefox = pkgs.firefox-devedition-unwrapped // {
|
||||
bugfixedFirefox = pkgs.firefox-esr-unwrapped // {
|
||||
requireSigning = false;
|
||||
allowAddonSideload = true;
|
||||
};
|
||||
|
|
@ -35,15 +35,9 @@ in
|
|||
})
|
||||
(pkgs.fetchFirefoxAddon {
|
||||
name = "ublock-origin";
|
||||
url = "https://addons.mozilla.org/firefox/downloads/file/4290466/ublock_origin-1.58.0.xpi";
|
||||
hash = "sha256-RwxWmUpxdNshV4rc5ZixWKXcCXDIfFz+iJrGMr0wheo=";
|
||||
url = "https://addons.mozilla.org/firefox/downloads/file/4198829/ublock_origin-1.54.0.xpi";
|
||||
hash = "sha256-l5cWCQgZFxD/CFhTa6bcKeytmSPDCyrW0+XjcddZ5E0=";
|
||||
})
|
||||
(pkgs.fetchFirefoxAddon {
|
||||
name = "user_agent_string_switcher";
|
||||
url = "https://addons.mozilla.org/firefox/downloads/file/4098688/user_agent_string_switcher-0.5.0.xpi";
|
||||
hash = "sha256-ncjaPIxG1PBNEv14nGNQH6ai9QL4WbKGk5oJDbY+rjM=";
|
||||
})
|
||||
|
||||
(pkgs.fetchFirefoxAddon {
|
||||
name = "i-still-dont-care-about-cookies";
|
||||
url = "https://github.com/OhMyGuus/I-Still-Dont-Care-About-Cookies/releases/download/v1.1.4/istilldontcareaboutcookies-1.1.4.xpi";
|
||||
|
|
@ -56,9 +50,14 @@ in
|
|||
hash = "sha256-lKLX6IWWtliRdH1Ig33rVEB4DVfbeuMw0dfUPV/mSSI=";
|
||||
})
|
||||
(pkgs.fetchFirefoxAddon {
|
||||
name = "invidious_redirect";
|
||||
url = "https://addons.mozilla.org/firefox/downloads/file/4292924/invidious_redirect_2-1.16.xpi";
|
||||
hash = "sha256-ApCc+MNmW9Wd/5seV6npePQVEaszT/rhD9EB7HGiUb8=";
|
||||
name = "unhook";
|
||||
url = "https://addons.mozilla.org/firefox/downloads/file/4050795/youtube_recommended_videos-1.6.2.xpi";
|
||||
hash = "sha256-xMuglNassZb9WqjfEGg6WeuhMACRuYqQor+iX1dEdsE=";
|
||||
})
|
||||
(pkgs.fetchFirefoxAddon {
|
||||
name = "return_youtube_dislikes";
|
||||
url = "https://addons.mozilla.org/firefox/downloads/file/4208483/return_youtube_dislikes-3.0.0.14.xpi";
|
||||
hash = "sha256-oxqyNUmEa36rkqCU6S34NJBHtIu9gH8GnRKAg8Oyf2E=";
|
||||
})
|
||||
|
||||
(pkgs.fetchFirefoxAddon {
|
||||
|
|
@ -86,7 +85,7 @@ in
|
|||
];
|
||||
};
|
||||
profiles = {
|
||||
dev-edition-default = {
|
||||
main = {
|
||||
isDefault = true;
|
||||
search.force = true;
|
||||
search.default = "DuckDuckGo";
|
||||
|
|
@ -107,7 +106,7 @@ in
|
|||
"media.rdd-vpx.enabled" = true;
|
||||
"media.rdd-wav.enabled" = true;
|
||||
|
||||
"media.av1.enabled" = true;
|
||||
"media.av1.enabled" = false;
|
||||
"media.ffmpeg.vaapi-drm-display.enabled" = true;
|
||||
"media.ffmpeg.vaapi.enabled" = true;
|
||||
"media.ffvpx.enabled" = true;
|
||||
|
|
@ -124,53 +123,10 @@ in
|
|||
"devtools.chrome.enabled" = true;
|
||||
"devtools.debugger.remote-enabled" = true;
|
||||
};
|
||||
userChrome =
|
||||
if desktop == "sway" then
|
||||
''
|
||||
#titlebar { display: none !important; }
|
||||
#sidebar-header { display: none !important; }
|
||||
''
|
||||
else
|
||||
''
|
||||
/* Element | chrome://browser/content/browser.xhtml */
|
||||
|
||||
#navigator-toolbox {
|
||||
display: grid;
|
||||
grid-template-columns: 1fr 50px;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
/* Element | chrome://browser/content/browser.xhtml */
|
||||
|
||||
#nav-bar {
|
||||
flex: 1;
|
||||
width: 100%;
|
||||
grid-column: 1 / 3;
|
||||
grid-row: 1;
|
||||
z-index: 0;
|
||||
padding-right: 29px !important;
|
||||
}
|
||||
|
||||
/* Element | chrome://browser/content/browser.xhtml */
|
||||
|
||||
.toolbar-items {
|
||||
display: none;
|
||||
}
|
||||
|
||||
/* Element | chrome://browser/content/browser.xhtml */
|
||||
|
||||
#TabsToolbar {
|
||||
max-width: 50px;
|
||||
}
|
||||
|
||||
/* Element | chrome://browser/content/browser.xhtml */
|
||||
|
||||
#titlebar {
|
||||
max-width: 50px;
|
||||
grid-area: 1 / 2;
|
||||
z-index: 10;
|
||||
}
|
||||
'';
|
||||
userChrome = lib.mkIf (desktop == "sway") ''
|
||||
#titlebar { display: none !important; }
|
||||
#sidebar-header { display: none !important; }
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -36,7 +36,6 @@ in
|
|||
shellAliases = {
|
||||
rm = "trash";
|
||||
tree = "eza -T";
|
||||
kill_yourself = "shutdown now";
|
||||
};
|
||||
shellAbbrs = {
|
||||
off = "shutdown now";
|
||||
|
|
|
|||
|
|
@ -103,29 +103,29 @@ function fish_git_prompt
|
|||
_fish_prompt_warn "init"
|
||||
end
|
||||
|
||||
# if we have at least one commit
|
||||
if git rev-parse HEAD -- &>/dev/null
|
||||
# print a "↑" if ahead of origin
|
||||
test 0 -ne (git log --oneline "$git_remote_branch"..HEAD -- | wc -l)
|
||||
and set -f _git_sync_ahead '↑'
|
||||
git rev-parse HEAD -- &>/dev/null
|
||||
or return
|
||||
|
||||
# print a "↓" if behind of origin
|
||||
test 0 -lt (git log --oneline HEAD.."$git_remote_branch" -- | wc -l)
|
||||
and set -l _git_sync_behind '↓'
|
||||
# print a "↑" if ahead of origin
|
||||
test 0 -ne (git log --oneline "$git_remote_branch"..HEAD -- | wc -l)
|
||||
and set -f _git_sync_ahead '↑'
|
||||
|
||||
if set -q _git_sync_ahead _git_sync_behind
|
||||
_fish_prompt_normal '⇅'
|
||||
else if set -q _git_sync_ahead
|
||||
_fish_prompt_normal '↑'
|
||||
else if set -q _git_sync_behind
|
||||
_fish_prompt_normal '↓'
|
||||
end
|
||||
# print a "↓" if behind of origin
|
||||
test 0 -lt (git log --oneline HEAD.."$git_remote_branch" -- | wc -l)
|
||||
and set -l _git_sync_behind '↓'
|
||||
|
||||
if test -n "$git_log_unpushed"
|
||||
and not string match -qr "$git_branch" "$git_log_unpushed"
|
||||
_fish_prompt_normal '↻'
|
||||
_fish_prompt_warn $git_log_unpushed[1]
|
||||
end
|
||||
if set -q _git_sync_ahead _git_sync_behind
|
||||
_fish_prompt_normal '⇅'
|
||||
else if set -q _git_sync_ahead
|
||||
_fish_prompt_normal '↑'
|
||||
else if set -q _git_sync_behind
|
||||
_fish_prompt_normal '↓'
|
||||
end
|
||||
|
||||
if test -n "$git_log_unpushed"
|
||||
and not string match -qr "$git_branch" "$git_log_unpushed"
|
||||
_fish_prompt_normal '↻'
|
||||
_fish_prompt_warn $git_log_unpushed[1]
|
||||
end
|
||||
|
||||
############################################################
|
||||
|
|
|
|||
|
|
@ -28,13 +28,16 @@ lib.mkIf (config.my.desktop == "gnome") {
|
|||
};
|
||||
|
||||
home.packages = with pkgs; [
|
||||
inputs.nixos-conf-editor.packages.${pkgs.system}.nixos-conf-editor
|
||||
inputs.nix-software-center.packages.${pkgs.system}.nix-software-center
|
||||
|
||||
adw-gtk3
|
||||
|
||||
newsflash
|
||||
foliate
|
||||
amberol
|
||||
pitivi
|
||||
keepassxc
|
||||
gnome-passwordsafe
|
||||
|
||||
libsForQt5.qt5ct
|
||||
libsForQt5.qtstyleplugin-kvantum
|
||||
|
|
@ -42,7 +45,9 @@ lib.mkIf (config.my.desktop == "gnome") {
|
|||
qt6Packages.qtstyleplugin-kvantum
|
||||
];
|
||||
|
||||
services.gpg-agent.pinentryPackage = pkgs.pinentry-gnome3;
|
||||
home.sessionVariables = {
|
||||
QT_QPA_PLATFORMTHEME = "qt5ct";
|
||||
};
|
||||
|
||||
xdg.defaultApplications = {
|
||||
enable = lib.mkForce false;
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@
|
|||
enable = true;
|
||||
defaultCacheTtl = 604800;
|
||||
maxCacheTtl = 604800;
|
||||
pinentryPackage = pkgs.pinentry-curses;
|
||||
extraConfig = ''
|
||||
allow-preset-passphrase
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@
|
|||
}:
|
||||
{
|
||||
imports = [
|
||||
./controller.nix
|
||||
./waybar
|
||||
./helix.nix
|
||||
./kakoune
|
||||
|
|
@ -41,7 +42,6 @@
|
|||
./xdg-dirs.nix
|
||||
inputs.nix-index-database.hmModules.nix-index
|
||||
../settings
|
||||
./powerplay-led-idle.nix
|
||||
];
|
||||
|
||||
my = import ./variables.nix;
|
||||
|
|
@ -52,7 +52,7 @@
|
|||
home.homeDirectory = "/home/lelgenio";
|
||||
|
||||
# Let Home Manager install and manage itself.
|
||||
programs.home-manager.enable = true;
|
||||
# programs.home-manager.enable = true;
|
||||
home.packages = with pkgs; [
|
||||
# home-manager
|
||||
|
||||
|
|
|
|||
|
|
@ -114,112 +114,3 @@ with colors;
|
|||
Hint = "blue";
|
||||
}
|
||||
))
|
||||
+ ''
|
||||
# Color palette
|
||||
declare-option str red "red"
|
||||
declare-option str mauve "magenta"
|
||||
declare-option str maroon "rgb:ee99a0"
|
||||
declare-option str pink "rgb:f5bde6"
|
||||
declare-option str cyan "cyan"
|
||||
declare-option str yellow "yellow"
|
||||
declare-option str green "green"
|
||||
declare-option str white "white"
|
||||
declare-option str blue "blue"
|
||||
declare-option str sky "rgb:91d7e3"
|
||||
declare-option str lavender "rgb:b7bdf8"
|
||||
declare-option str black1 "rgb:202020"
|
||||
declare-option str black2 "rgb:272727"
|
||||
declare-option str black3 "rgb:3a3a3a"
|
||||
declare-option str orange ${orange}
|
||||
declare-option str teal "rgb:8bd5ca"
|
||||
declare-option str flamingo "rgb:f0c6c6"
|
||||
declare-option str gray0 "rgb:606060"
|
||||
declare-option str gray1 "rgb:737373"
|
||||
declare-option str bright_red "%opt{red}+b"
|
||||
declare-option str bright_green "%opt{green}+b"
|
||||
declare-option str bright_yellow "%opt{yellow}+b"
|
||||
declare-option str bright_blue "%opt{blue}+b"
|
||||
declare-option str bright_cyan "%opt{cyan}+b"
|
||||
declare-option str foreground %opt{white}
|
||||
declare-option str background %opt{black2}
|
||||
declare-option str overlay0 "rgb:878787"
|
||||
declare-option str overlay1 "rgb:9a9a9a"
|
||||
|
||||
# Tree-sitter (<https://git.sr.ht/~hadronized/kak-tree-sitter>)
|
||||
set-face global ts_attribute "%opt{cyan}"
|
||||
set-face global ts_comment "%opt{overlay0}+i"
|
||||
set-face global ts_conceal "%opt{mauve}+i"
|
||||
set-face global ts_constant "%opt{orange}"
|
||||
set-face global ts_constant_builtin_boolean "%opt{sky}"
|
||||
set-face global ts_constant_character "%opt{yellow}"
|
||||
set-face global ts_constant_macro "%opt{mauve}"
|
||||
set-face global ts_constructor "%opt{cyan}"
|
||||
set-face global ts_diff_plus "%opt{green}"
|
||||
set-face global ts_diff_minus "%opt{red}"
|
||||
set-face global ts_diff_delta "%opt{blue}"
|
||||
set-face global ts_diff_delta_moved "%opt{mauve}"
|
||||
set-face global ts_error "%opt{red}+b"
|
||||
set-face global ts_function "%opt{blue}"
|
||||
set-face global ts_function_builtin "%opt{blue}+i"
|
||||
set-face global ts_function_macro "%opt{mauve}"
|
||||
set-face global ts_hint "%opt{blue}+b"
|
||||
set-face global ts_info "%opt{green}+b"
|
||||
set-face global ts_keyword "%opt{mauve}"
|
||||
set-face global ts_keyword_conditional "%opt{mauve}+i"
|
||||
set-face global ts_keyword_control_conditional "%opt{mauve}+i"
|
||||
set-face global ts_keyword_control_directive "%opt{mauve}+i"
|
||||
set-face global ts_keyword_control_import "%opt{mauve}+i"
|
||||
set-face global ts_keyword_directive "%opt{mauve}+i"
|
||||
set-face global ts_keyword_storage "%opt{mauve}"
|
||||
set-face global ts_keyword_storage_modifier "%opt{mauve}"
|
||||
set-face global ts_keyword_storage_modifier_mut "%opt{mauve}"
|
||||
set-face global ts_keyword_storage_modifier_ref "%opt{teal}"
|
||||
set-face global ts_label "%opt{cyan}+i"
|
||||
set-face global ts_markup_bold "%opt{orange}+b"
|
||||
set-face global ts_markup_heading "%opt{red}"
|
||||
set-face global ts_markup_heading_1 "%opt{red}"
|
||||
set-face global ts_markup_heading_2 "%opt{mauve}"
|
||||
set-face global ts_markup_heading_3 "%opt{green}"
|
||||
set-face global ts_markup_heading_4 "%opt{yellow}"
|
||||
set-face global ts_markup_heading_5 "%opt{pink}"
|
||||
set-face global ts_markup_heading_6 "%opt{teal}"
|
||||
set-face global ts_markup_heading_marker "%opt{orange}+b"
|
||||
set-face global ts_markup_italic "%opt{pink}+i"
|
||||
set-face global ts_markup_list_checked "%opt{green}"
|
||||
set-face global ts_markup_list_numbered "%opt{blue}+i"
|
||||
set-face global ts_markup_list_unchecked "%opt{teal}"
|
||||
set-face global ts_markup_list_unnumbered "%opt{mauve}"
|
||||
set-face global ts_markup_link_label "%opt{blue}"
|
||||
set-face global ts_markup_link_url "%opt{teal}+u"
|
||||
set-face global ts_markup_link_uri "%opt{teal}+u"
|
||||
set-face global ts_markup_link_text "%opt{blue}"
|
||||
set-face global ts_markup_quote "%opt{gray1}"
|
||||
set-face global ts_markup_raw "%opt{green}"
|
||||
set-face global ts_markup_strikethrough "%opt{gray1}+s"
|
||||
set-face global ts_namespace "%opt{blue}+i"
|
||||
set-face global ts_operator "%opt{sky}"
|
||||
set-face global ts_property "%opt{sky}"
|
||||
set-face global ts_punctuation "%opt{overlay1}"
|
||||
set-face global ts_punctuation_special "%opt{sky}"
|
||||
set-face global ts_special "%opt{blue}"
|
||||
set-face global ts_spell "%opt{mauve}"
|
||||
set-face global ts_string "%opt{green}"
|
||||
set-face global ts_string_regex "%opt{orange}"
|
||||
set-face global ts_string_regexp "%opt{orange}"
|
||||
set-face global ts_string_escape "%opt{mauve}"
|
||||
set-face global ts_string_special "%opt{blue}"
|
||||
set-face global ts_string_special_path "%opt{orange}"
|
||||
set-face global ts_string_special_symbol "%opt{mauve}"
|
||||
set-face global ts_string_symbol "%opt{red}"
|
||||
set-face global ts_tag "%opt{mauve}"
|
||||
set-face global ts_tag_error "%opt{red}"
|
||||
set-face global ts_text "%opt{white}"
|
||||
set-face global ts_text_title "%opt{mauve}"
|
||||
set-face global ts_type "%opt{yellow}"
|
||||
set-face global ts_type_enum_variant "%opt{flamingo}"
|
||||
set-face global ts_variable "%opt{blue}"
|
||||
set-face global ts_variable_builtin "%opt{red}"
|
||||
set-face global ts_variable_other_member "%opt{teal}"
|
||||
set-face global ts_variable_parameter "%opt{maroon}+i"
|
||||
set-face global ts_warning "%opt{orange}+b"
|
||||
''
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@
|
|||
}:
|
||||
let
|
||||
inherit (config.my)
|
||||
key
|
||||
dmenu
|
||||
editor
|
||||
theme
|
||||
|
|
@ -16,7 +17,6 @@ let
|
|||
inherit (pkgs.kakouneUtils) buildKakounePlugin;
|
||||
in
|
||||
{
|
||||
imports = [ ./kak-tree-sitter.nix ];
|
||||
config = {
|
||||
programs.kakoune = {
|
||||
enable = true;
|
||||
|
|
@ -100,9 +100,6 @@ in
|
|||
)
|
||||
)
|
||||
+ ''
|
||||
try %{
|
||||
eval %sh{ kak-tree-sitter -vvvv -dks --init $kak_session }
|
||||
}
|
||||
|
||||
set global scrolloff 10,20
|
||||
set global autoreload yes
|
||||
|
|
@ -121,13 +118,11 @@ in
|
|||
home.file = {
|
||||
".config/kak-lsp/kak-lsp.toml".source = ./kak-lsp.toml;
|
||||
};
|
||||
|
||||
home.packages = with pkgs; [
|
||||
terminal
|
||||
ranger
|
||||
bmenu
|
||||
kak-lsp
|
||||
kak-tree-sitter
|
||||
kak-pager
|
||||
kak-man-pager
|
||||
|
||||
|
|
|
|||
|
|
@ -32,7 +32,6 @@ map global git 'N' ': git-next-merge-conflict <ret>' -docstring 'next git me
|
|||
map global git 'P' ': git-prev-merge-conflict <ret>' -docstring 'previous git merge conflict'
|
||||
map global git 'm' ': git-merge-head <ret>' -docstring 'merge using head'
|
||||
map global git 'M' ': git-merge-new <ret>' -docstring 'merge using new'
|
||||
map global git '<c-m>' ': git-merge-head-and-new <ret>' -docstring 'merge using both head and new'
|
||||
map global git '<a-m>' ': git-merge-original <ret>' -docstring 'merge using original'
|
||||
|
||||
define-command -override git-next-merge-conflict %{
|
||||
|
|
@ -93,19 +92,6 @@ define-command -override git-merge-new %{
|
|||
}
|
||||
} -docstring "merge using new"
|
||||
|
||||
define-command -override git-merge-head-and-new %{
|
||||
evaluate-commands -draft %{
|
||||
# delete head marker
|
||||
execute-keys <a-/>^<lt>{4,}<ret>xd
|
||||
# select middle of conflict
|
||||
execute-keys /^[|]{4,}<ret>x
|
||||
# extendo to theirs marker
|
||||
execute-keys ?^={4,}<ret>xd
|
||||
# delete end marker
|
||||
execute-keys /^<gt>{4,}<ret>xd
|
||||
}
|
||||
} -docstring "merge using head and new"
|
||||
|
||||
define-command -override git-graph %{
|
||||
try %{ delete-buffer '*git-graph*' }
|
||||
edit -scratch '*git-graph*'
|
||||
|
|
|
|||
|
|
@ -1,64 +0,0 @@
|
|||
{ pkgs, lib, ... }:
|
||||
let
|
||||
hx-src = pkgs.helix.src;
|
||||
kts-src = pkgs.kak-tree-sitter.src;
|
||||
inherit (pkgs) fetchFromGitHub;
|
||||
in
|
||||
with pkgs.tree-sitter-grammars;
|
||||
{
|
||||
xdg.configFile."kak-tree-sitter/config.toml".text =
|
||||
lib.foldlAttrs
|
||||
(
|
||||
acc: name: vals:
|
||||
acc
|
||||
+ ''
|
||||
[language.${name}.grammar.source.local]
|
||||
path = "${vals.parser}"
|
||||
[language.${name}.grammar]
|
||||
compile = "cc"
|
||||
compile_args = ["-c", "-fpic", "../scanner.c", "../parser.c", "-I", ".."]
|
||||
compile_flags = ["-O3"]
|
||||
link = "cc"
|
||||
link_args = ["-shared", "-fpic", "scanner.o", "parser.o", "-o", "typescript.so"]
|
||||
link_flags = ["-O3"]
|
||||
[language.${name}.queries.source.local]
|
||||
path = "${vals.queries}"
|
||||
[language.${name}.queries]
|
||||
path = "${vals.queries}"
|
||||
''
|
||||
)
|
||||
""
|
||||
{
|
||||
nix = {
|
||||
parser = tree-sitter-nix + "/parser";
|
||||
queries = tree-sitter-nix + "/queries";
|
||||
};
|
||||
|
||||
scss = {
|
||||
parser = tree-sitter-scss + "/parser";
|
||||
queries = tree-sitter-scss + "/queries";
|
||||
};
|
||||
css = {
|
||||
parser = tree-sitter-css + "/parser";
|
||||
queries = tree-sitter-css + "/queries";
|
||||
};
|
||||
|
||||
javascript = {
|
||||
parser = tree-sitter-javascript + "/parser";
|
||||
queries = tree-sitter-javascript + "/queries";
|
||||
};
|
||||
typescript = {
|
||||
parser =
|
||||
tree-sitter-typescript.overrideAttrs (old: {
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
repo = "tree-sitter-typescript";
|
||||
rev = "b1bf4825d9eaa0f3bdeb1e52f099533328acfbdf";
|
||||
hash = "sha256-oZKit8kScXcOptmT2ckywL5JlAVe+wuwhuj6ThEI5OQ=";
|
||||
};
|
||||
})
|
||||
+ "/parser";
|
||||
queries = kts-src + "/runtime/queries/typescript";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -492,7 +492,6 @@ in
|
|||
{
|
||||
enable = true;
|
||||
defaultApplications = mimes;
|
||||
associations.added = mimes;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,12 +9,7 @@
|
|||
config = {
|
||||
programs.password-store = {
|
||||
enable = true;
|
||||
package = pkgs.pass.withExtensions (
|
||||
ex: with ex; [
|
||||
pass-otp
|
||||
pass-import
|
||||
]
|
||||
);
|
||||
package = pkgs.pass.withExtensions (ex: with ex; [ pass-otp ]);
|
||||
};
|
||||
services = {
|
||||
pass-secret-service.enable = true;
|
||||
|
|
@ -31,7 +26,6 @@
|
|||
_gpg-unlock
|
||||
qtpass
|
||||
readQrCode
|
||||
pass-export
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,17 +0,0 @@
|
|||
{ pkgs, lib, ... }:
|
||||
{
|
||||
systemd.user.services.powerplay-led-idle = {
|
||||
Unit = {
|
||||
Description = "Autosuspend Powerplay mousepad led";
|
||||
PartOf = [ "graphical-session.target" ];
|
||||
After = [ "graphical-session.target" ];
|
||||
};
|
||||
Service = {
|
||||
ExecStart = lib.getExe pkgs.powerplay-led-idle;
|
||||
Restart = "on-failure";
|
||||
};
|
||||
Install = {
|
||||
WantedBy = [ "graphical-session.target" ];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -69,9 +69,9 @@ in
|
|||
};
|
||||
output = {
|
||||
"*" = {
|
||||
adaptive_sync = "off";
|
||||
bg = "${theme.background} fill";
|
||||
mode = "1920x1080@144.000Hz";
|
||||
adaptive_sync = "on";
|
||||
};
|
||||
};
|
||||
fonts = {
|
||||
|
|
@ -80,12 +80,6 @@ in
|
|||
};
|
||||
# Ignore PS4 controller touchpad events
|
||||
input."1356:2508:Wireless_Controller_Touchpad".events = "disabled";
|
||||
|
||||
input."1133:16537:Logitech_G502_X_PLUS" = {
|
||||
accel_profile = "flat";
|
||||
pointer_accel = "0";
|
||||
};
|
||||
|
||||
input."type:touchpad" = {
|
||||
# Disable While Typing
|
||||
dwt = "enabled";
|
||||
|
|
@ -122,7 +116,20 @@ in
|
|||
indicator = true;
|
||||
};
|
||||
|
||||
services.gpg-agent.pinentryPackage = pkgs.pinentry-all;
|
||||
systemd.user.services.vrr-fullscreen = {
|
||||
Unit = {
|
||||
Description = "Enable VRR for fullscreen windows";
|
||||
PartOf = [ "graphical-session.target" ];
|
||||
After = [ "graphical-session.target" ];
|
||||
};
|
||||
Service = {
|
||||
ExecStart = "${lib.getExe pkgs.vrr-fullscreen}";
|
||||
Restart = "on-failure";
|
||||
};
|
||||
Install = {
|
||||
WantedBy = [ "sway-session.target" ];
|
||||
};
|
||||
};
|
||||
|
||||
xdg.configFile."OpenTabletDriver/settings.json".source = ./open-tablet-driver.json;
|
||||
|
||||
|
|
@ -139,7 +146,6 @@ in
|
|||
wdmenu
|
||||
wlauncher
|
||||
volumesh
|
||||
brightnessctl
|
||||
showkeys
|
||||
pamixer
|
||||
libnotify
|
||||
|
|
@ -152,8 +158,7 @@ in
|
|||
wl-crosshair
|
||||
|
||||
grim
|
||||
satty
|
||||
xdg-user-dirs
|
||||
swappy
|
||||
(tesseract5.override {
|
||||
enableLanguages = [
|
||||
"eng"
|
||||
|
|
|
|||
|
|
@ -44,8 +44,6 @@ in
|
|||
{ title = "Discord"; }
|
||||
{ class = "WebCord"; }
|
||||
{ app_id = "WebCord"; }
|
||||
{ class = "vesktop"; }
|
||||
{ app_id = "vesktop"; }
|
||||
{ class = "Element"; }
|
||||
{ app_id = "Element"; }
|
||||
];
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@ let
|
|||
_lock = pkgs.writeShellScriptBin "_lock" ''
|
||||
${pkgs.sway}/bin/swaymsg mode default
|
||||
${pkgs.swaylock}/bin/swaylock -f
|
||||
systemctl --user start swayidle.service
|
||||
'';
|
||||
_suspend = pkgs.writeShellScriptBin "_suspend" ''
|
||||
${pkgs.sway}/bin/swaymsg mode default
|
||||
|
|
@ -157,12 +158,6 @@ let
|
|||
"Control+Print" = "exec ${pkgs.screenshotsh}/bin/screenshotsh clip";
|
||||
};
|
||||
|
||||
screen_binds = {
|
||||
"XF86MonBrightnessDown" = "exec brightnessctl --min-value=1 set 5%-";
|
||||
"XF86MonBrightnessUp" = "exec brightnessctl --min-value=1 set 5%+";
|
||||
"${mod}+l" = lib.getExe _lock;
|
||||
};
|
||||
|
||||
other_binds = {
|
||||
"${mod}+p" = "exec ${pkgs.wpass}/bin/wpass";
|
||||
"${mod}+s" = "exec ${menu}";
|
||||
|
|
@ -170,9 +165,7 @@ let
|
|||
"${mod}+c" = "exec ${pkgs.color_picker}/bin/color_picker";
|
||||
"${mod}+Return" = "exec ${terminal}";
|
||||
"${mod}+Ctrl+Return" = "exec thunar";
|
||||
"${mod}+Shift+s" = ''
|
||||
exec grim - | satty --filename - --fullscreen --output-filename "$(xdg-user-dir PICTURES)"/Screenshots/satty-$(date '+%Y%m%d-%H:%M:%S').png
|
||||
'';
|
||||
"${mod}+Shift+s" = "exec grim - | swappy -f -";
|
||||
"${mod}+Ctrl+v" = "exec wl-paste | tesseract -l por - - | wl-copy";
|
||||
"${mod}+k" = "exec showkeys";
|
||||
"${mod}+Alt+x" = "exec pkill wl-crosshair || exec wl-crosshair";
|
||||
|
|
@ -203,6 +196,5 @@ in
|
|||
system_binds
|
||||
parenting_binds
|
||||
screenshot_binds
|
||||
screen_binds
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -48,14 +48,9 @@ lib.mkIf (desktop == "sway") {
|
|||
gtk3 = shared;
|
||||
}
|
||||
);
|
||||
|
||||
xdg.configFile."gtk-3.0/settings.ini".force = true;
|
||||
xdg.configFile."gtk-4.0/settings.ini".force = true;
|
||||
|
||||
qt = {
|
||||
enable = true;
|
||||
platformTheme.name = "gtk3";
|
||||
style.name = "qt5ct";
|
||||
platformTheme.name = "qtct";
|
||||
};
|
||||
|
||||
dconf.settings = {
|
||||
|
|
@ -84,13 +79,6 @@ lib.mkIf (desktop == "sway") {
|
|||
# fixed=@Variant(\0\0\0@\0\0\0\x1c\0H\0\x61\0\x63\0k\0 \0N\0\x65\0r\0\x64\0 \0\x46\0o\0n\0t@(\0\0\0\0\0\0\xff\xff\xff\xff\x5\x1\0\x32\x10)
|
||||
# general=@Variant(\0\0\0@\0\0\0\x1e\0L\0i\0\x62\0\x65\0r\0\x61\0t\0i\0o\0n\0 \0S\0\x61\0n\0s@(\0\0\0\0\0\0\xff\xff\xff\xff\x5\x1\0\x32\x10)
|
||||
'';
|
||||
"kdedefaults/kdeglobals".text = ''
|
||||
[General]
|
||||
ColorScheme=BreezeDark
|
||||
|
||||
[Icons]
|
||||
Theme=${icon_theme}
|
||||
'';
|
||||
};
|
||||
services.xsettingsd = {
|
||||
enable = true;
|
||||
|
|
|
|||
|
|
@ -10,12 +10,6 @@
|
|||
})
|
||||
];
|
||||
|
||||
wayland.windowManager.sway = {
|
||||
extraConfig = ''
|
||||
exec_always systemctl --user import-environment PATH
|
||||
'';
|
||||
};
|
||||
|
||||
xdg.configFile = {
|
||||
"Thunar/".source = ./thunar;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
programs.vscode = {
|
||||
enable = true;
|
||||
package = pkgs.vscodium;
|
||||
package = pkgs.vscodium-fhs;
|
||||
extensions = with pkgs.vscode-extensions; [
|
||||
jnoortheen.nix-ide
|
||||
github.github-vscode-theme
|
||||
|
|
|
|||
|
|
@ -106,7 +106,7 @@ in
|
|||
};
|
||||
clock = {
|
||||
interval = 60;
|
||||
format = "<b>{:L%H:%M %a %d/%m}</b>";
|
||||
format = "<b>{:%H:%M %a %d/%m}</b>";
|
||||
tooltip-format = "<tt><small>{calendar}</small></tt>";
|
||||
calendar = {
|
||||
mode = "year";
|
||||
|
|
@ -137,8 +137,9 @@ in
|
|||
{
|
||||
format = "{stateIcon} {title} - {artist}";
|
||||
format-paused = "{stateIcon}";
|
||||
format-stopped = "";
|
||||
format-stopped = "{stateIcon}";
|
||||
state-icons = {
|
||||
stopped = "";
|
||||
paused = "";
|
||||
playing = "";
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in a new issue