Merge remote-tracking branch 'origin/nixos' into nixos-work
This commit is contained in:
commit
066ff795f6
20 changed files with 764 additions and 288 deletions
417
flake.lock
generated
417
flake.lock
generated
|
|
@ -23,11 +23,11 @@
|
|||
"arkenfox-userjs": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1668350246,
|
||||
"narHash": "sha256-yBHOofhwXRDzuv/PeZ4J7LME42wt5Hb2+5LDd0aliYE=",
|
||||
"lastModified": 1670682948,
|
||||
"narHash": "sha256-yFg8U4D+qD9UQXhpAXrl9Ksj16zrCLOgahMtT9QS2Y8=",
|
||||
"owner": "arkenfox",
|
||||
"repo": "user.js",
|
||||
"rev": "365e76bc9f2c9bf30509ce5f1aec6627ad84c84b",
|
||||
"rev": "7135907b2fe13fa55eb8ebf162603037f83e353c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -53,65 +53,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"base16": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1658847131,
|
||||
"narHash": "sha256-X6Mml7cT0YR3WCD5fkUhpRVV5ZPcwdcDsND8r8xMqTE=",
|
||||
"owner": "SenchoPens",
|
||||
"repo": "base16.nix",
|
||||
"rev": "6b404cda2e04ca3cf5ca7b877af9c469e1386acb",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "SenchoPens",
|
||||
"repo": "base16.nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"comma": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat",
|
||||
"naersk": "naersk",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"utils": "utils"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1666010793,
|
||||
"narHash": "sha256-6zhTpR0cfaHrupOXRZAdCzLAGINgsB6h3HQnj7+qHWs=",
|
||||
"owner": "nix-community",
|
||||
"repo": "comma",
|
||||
"rev": "691120d169189f3a9cb29b1c72bcd521ac372b2b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "comma",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"dracula-fish": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1657833273,
|
||||
"narHash": "sha256-WywEGAGaRwfHJpT+B3oKoyrnLJZxURTQ+MK9e5Asxl0=",
|
||||
"owner": "dracula",
|
||||
"repo": "fish",
|
||||
"rev": "610147cc384ff161fbabb9a9ebfd22b743f82b67",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "dracula",
|
||||
"repo": "fish",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"emacs-overlay": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils",
|
||||
|
|
@ -120,11 +61,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1668392064,
|
||||
"narHash": "sha256-9uK2WsZNBJgEEY3xkRPYUrVaQf5izYDd742pAT/LuFc=",
|
||||
"lastModified": 1672567750,
|
||||
"narHash": "sha256-Hz1b1TUJbzuLj0eR+LTSUqoGR2gkQdrm3uxru+0rVuY=",
|
||||
"owner": "nix-community",
|
||||
"repo": "emacs-overlay",
|
||||
"rev": "6cee62d984b76a01998ec7961277f650574aef61",
|
||||
"rev": "524c884484c312b76cb4bc9fbf37eec66e2f8406",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -136,11 +77,11 @@
|
|||
"flake-compat": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1650374568,
|
||||
"narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=",
|
||||
"lastModified": 1668681692,
|
||||
"narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=",
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"rev": "b4a34015c698c7793d592d66adbab377907a2be8",
|
||||
"rev": "009399224d5e398d03b22badca40a37ac85412a1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -181,11 +122,11 @@
|
|||
},
|
||||
"flake-utils_3": {
|
||||
"locked": {
|
||||
"lastModified": 1667077288,
|
||||
"narHash": "sha256-bdC8sFNDpT0HK74u9fUkpbf1MEzVYJ+ka7NXCdgBoaA=",
|
||||
"lastModified": 1667395993,
|
||||
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "6ee9ebb6b1ee695d2cacc4faa053a7b9baa76817",
|
||||
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -212,11 +153,11 @@
|
|||
"forgit-git": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1665756353,
|
||||
"narHash": "sha256-NKL4c4k9Nath8NQ3sWUTGUzp517jRX4v0qVaKMJSMrw=",
|
||||
"lastModified": 1671476278,
|
||||
"narHash": "sha256-guAjxFhtybbRyRRXDELDHrM2Xzmi96wPxD2nhL9Ifmk=",
|
||||
"owner": "wfxr",
|
||||
"repo": "forgit",
|
||||
"rev": "2872548075e63bc83a0b960e2813b16571998563",
|
||||
"rev": "ffda73bac3a435a9bbc6f29f2fd98517fbe5d9db",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -225,19 +166,40 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"gitignore": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"pre-commit-hooks",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1660459072,
|
||||
"narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "gitignore.nix",
|
||||
"rev": "a20de23b925fd8264fd7fad6454652e142fd7f73",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "hercules-ci",
|
||||
"repo": "gitignore.nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"home-manager": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"utils": "utils_2"
|
||||
"utils": "utils"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1668332334,
|
||||
"narHash": "sha256-YT1qcE/MCqBO1Bi/Yr6GcFpNKsvmzrBKh8juyXDbxQc=",
|
||||
"lastModified": 1672349765,
|
||||
"narHash": "sha256-Ul3lSGglgHXhgU3YNqsNeTlRH1pqxbR64h+2hM+HtnM=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "bc90de24d898655542589237cc0a6ada7564cb6c",
|
||||
"rev": "dd99675ee81fef051809bc87d67eb07f5ba022e8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -249,30 +211,121 @@
|
|||
"howdy": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils_2",
|
||||
"nixpkgs": "nixpkgs",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"pre-commit-hooks": "pre-commit-hooks"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1665343480,
|
||||
"narHash": "sha256-mMaZFrDDiBcHDe8+lA87P3iMPea+RGfik5/E4Dyzk8U=",
|
||||
"ref": "refs/heads/main",
|
||||
"owner": "~moritzboehme",
|
||||
"repo": "howdy",
|
||||
"rev": "24a7cfb8c2fef1873275dbdf7c8ad562c22083de",
|
||||
"revCount": 5,
|
||||
"type": "git",
|
||||
"url": "https://git.sr.ht/~moritzboehme/howdy"
|
||||
"type": "sourcehut"
|
||||
},
|
||||
"original": {
|
||||
"type": "git",
|
||||
"url": "https://git.sr.ht/~moritzboehme/howdy"
|
||||
"owner": "~moritzboehme",
|
||||
"repo": "howdy",
|
||||
"type": "sourcehut"
|
||||
}
|
||||
},
|
||||
"hypr-contrib": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1672071700,
|
||||
"narHash": "sha256-Z0pbBVtijv4xbL42rPzMoYFSOqALFRYDMN9iOumSEso=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "contrib",
|
||||
"rev": "37c8121f98d76f57caa00dd7106877876e0d7483",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "hyprwm",
|
||||
"repo": "contrib",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"hyprland": {
|
||||
"inputs": {
|
||||
"hyprland-protocols": "hyprland-protocols",
|
||||
"nixpkgs": "nixpkgs_2",
|
||||
"wlroots": "wlroots",
|
||||
"xdph": "xdph"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1672510982,
|
||||
"narHash": "sha256-fxpb2GM2Zi4DU119b7c1g8RN/jF7WXD5UcjXN7lxPJ8=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "Hyprland",
|
||||
"rev": "7525818097f92a99b2b8d02ea43bd0f8ccabd51c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "hyprwm",
|
||||
"repo": "Hyprland",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"hyprland-protocols": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1670703428,
|
||||
"narHash": "sha256-4KUW5SKR0Y9uaYGcYwy53YJ3B/sgiprCL4fRGO+mpOA=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprland-protocols",
|
||||
"rev": "d0d6db8cb5bef6d93ca3ad8fb2124964173396da",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprland-protocols",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"hyprland-protocols_2": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1670703428,
|
||||
"narHash": "sha256-4KUW5SKR0Y9uaYGcYwy53YJ3B/sgiprCL4fRGO+mpOA=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprland-protocols",
|
||||
"rev": "d0d6db8cb5bef6d93ca3ad8fb2124964173396da",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprland-protocols",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"hyprpaper": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_3"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1672266418,
|
||||
"narHash": "sha256-Xxooxjoymgl65dIMtcBB4/bZx0OcqPZ52G/fw4rozYE=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprpaper",
|
||||
"rev": "aefd63876d0353e4b25e473708903e6c30054931",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprpaper",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"master": {
|
||||
"locked": {
|
||||
"lastModified": 1668405764,
|
||||
"narHash": "sha256-EjVfda5aRl5Co9ugTfOP/FAH+QmZBkt8SN0uOposzTg=",
|
||||
"lastModified": 1672582743,
|
||||
"narHash": "sha256-BcHOaoxnUL+DzjGZV+vm8rIDGOFL6DvbPxeCLvzDrN0=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "4f34f4a8633e1f63c1c18c370d63589527f4afd5",
|
||||
"rev": "3d9c0b6bdb5d6ee7126b6362167550c74590d612",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -281,51 +334,77 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"naersk": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"comma",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1662220400,
|
||||
"narHash": "sha256-9o2OGQqu4xyLZP9K6kNe1pTHnyPz0Wr3raGYnr9AIgY=",
|
||||
"owner": "nix-community",
|
||||
"repo": "naersk",
|
||||
"rev": "6944160c19cb591eb85bbf9b2f2768a935623ed3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"ref": "master",
|
||||
"repo": "naersk",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1665266435,
|
||||
"narHash": "sha256-vLhkXxNzAIvJNLyjm6fGe9Rwy/lsE9dc5MgV7w1EtCs=",
|
||||
"owner": "nixos",
|
||||
"lastModified": 1658161305,
|
||||
"narHash": "sha256-X/nhnMCa1Wx4YapsspyAs6QYz6T/85FofrI6NpdPDHg=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "8e8b0bd1fd99ac2bdca112f9e2431d7c80b1d655",
|
||||
"rev": "e4d49de45a3b5dbcb881656b4e3986e666141ea9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixpkgs-unstable",
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-stable": {
|
||||
"locked": {
|
||||
"lastModified": 1671271954,
|
||||
"narHash": "sha256-cSvu+bnvN08sOlTBWbBrKaBHQZq8mvk8bgpt0ZJ2Snc=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "d513b448cc2a6da2c8803e3c197c9fc7e67b19e3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-22.05",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1668266328,
|
||||
"narHash": "sha256-+nAW+XR8nswyEnt5IkQlkrz9erTcQWBVLkhtNHxckFw=",
|
||||
"lastModified": 1671722432,
|
||||
"narHash": "sha256-ojcZUekIQeOZkHHzR81st7qxX99dB1Eaaq6PU5MNeKc=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "652e92b8064949a11bc193b90b74cb727f2a1405",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1658826464,
|
||||
"narHash": "sha256-94ZTF0uIX/iZdiD4RJ5f933ak/OM4XLl7hF+gCa4Iuk=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "ce49cb7792a7ffd65ef352dda1110a4e4a204eac",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_4": {
|
||||
"locked": {
|
||||
"lastModified": 1672428209,
|
||||
"narHash": "sha256-eejhqkDz2cb2vc5VeaWphJz8UXNuoNoM8/Op8eWv2tQ=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "5ca8e2e9e1fa5e66a749b39261ad6bd0e07bc87f",
|
||||
"rev": "293a28df6d7ff3dec1e61e37cc4ee6e6c0fb0847",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -335,18 +414,20 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_3": {
|
||||
"nixpkgs_5": {
|
||||
"locked": {
|
||||
"lastModified": 1667292599,
|
||||
"narHash": "sha256-7ISOUI1aj6UKMPIL+wwthENL22L3+A9V+jS8Is3QsRo=",
|
||||
"lastModified": 1671271357,
|
||||
"narHash": "sha256-xRJdLbWK4v2SewmSStYrcLa0YGJpleufl44A19XSW8k=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "ef2f213d9659a274985778bff4ca322f3ef3ac68",
|
||||
"rev": "40f79f003b6377bd2f4ed4027dde1f8f922995dd",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"id": "nixpkgs",
|
||||
"type": "indirect"
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"pre-commit-hooks": {
|
||||
|
|
@ -376,15 +457,18 @@
|
|||
},
|
||||
"pre-commit-hooks_2": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat",
|
||||
"flake-utils": "flake-utils_3",
|
||||
"nixpkgs": "nixpkgs_3"
|
||||
"gitignore": "gitignore",
|
||||
"nixpkgs": "nixpkgs_5",
|
||||
"nixpkgs-stable": "nixpkgs-stable"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1667992213,
|
||||
"narHash": "sha256-8Ens8ozllvlaFMCZBxg6S7oUyynYx2v7yleC5M0jJsE=",
|
||||
"lastModified": 1672050129,
|
||||
"narHash": "sha256-GBQMcvJUSwAVOpDjVKzB6D5mmHI7Y4nFw+04bnS9QrM=",
|
||||
"owner": "cachix",
|
||||
"repo": "pre-commit-hooks.nix",
|
||||
"rev": "ebcbfe09d2bd6d15f68de3a0ebb1e4dcb5cd324b",
|
||||
"rev": "67d98f02443b9928bc77f1267741dcfdd3d7b65c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -398,52 +482,37 @@
|
|||
"agenix": "agenix",
|
||||
"arkenfox-userjs": "arkenfox-userjs",
|
||||
"asus-touchpad-numpad-driver": "asus-touchpad-numpad-driver",
|
||||
"base16": "base16",
|
||||
"comma": "comma",
|
||||
"dracula-fish": "dracula-fish",
|
||||
"emacs-overlay": "emacs-overlay",
|
||||
"forgit-git": "forgit-git",
|
||||
"home-manager": "home-manager",
|
||||
"howdy": "howdy",
|
||||
"hypr-contrib": "hypr-contrib",
|
||||
"hyprland": "hyprland",
|
||||
"hyprpaper": "hyprpaper",
|
||||
"master": "master",
|
||||
"nixpkgs": "nixpkgs_2",
|
||||
"nixpkgs": "nixpkgs_4",
|
||||
"pre-commit-hooks": "pre-commit-hooks_2",
|
||||
"stable": "stable",
|
||||
"utils": "utils_3"
|
||||
"utils": "utils_2"
|
||||
}
|
||||
},
|
||||
"stable": {
|
||||
"locked": {
|
||||
"lastModified": 1668281765,
|
||||
"narHash": "sha256-6Tuj9CZ9HacMk7FJ8sF9XSVTBnUhVzlSY40Jo1krIaQ=",
|
||||
"lastModified": 1672353432,
|
||||
"narHash": "sha256-oZfgp/44/o2tWiylV30cR+DLyWTJ+5dhsdWZVpzs3e4=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "c5091eec689acc45d4d818109236da31d3685ca2",
|
||||
"rev": "913a47cd064cc06440ea84e5e0452039a85781f0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-22.05",
|
||||
"ref": "nixos-22.11",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"utils": {
|
||||
"locked": {
|
||||
"lastModified": 1659877975,
|
||||
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"utils_2": {
|
||||
"locked": {
|
||||
"lastModified": 1667395993,
|
||||
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
|
||||
|
|
@ -458,7 +527,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"utils_3": {
|
||||
"utils_2": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils_4"
|
||||
},
|
||||
|
|
@ -475,6 +544,46 @@
|
|||
"repo": "flake-utils-plus",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"wlroots": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"host": "gitlab.freedesktop.org",
|
||||
"lastModified": 1671723353,
|
||||
"narHash": "sha256-G1jiI0SA7eiZusO+iJytErMRNbKbwqJJJGL+sNoBNoQ=",
|
||||
"owner": "wlroots",
|
||||
"repo": "wlroots",
|
||||
"rev": "b28a9afd4b0b86e9a66a40f6b44b69f59947b7d6",
|
||||
"type": "gitlab"
|
||||
},
|
||||
"original": {
|
||||
"host": "gitlab.freedesktop.org",
|
||||
"owner": "wlroots",
|
||||
"repo": "wlroots",
|
||||
"type": "gitlab"
|
||||
}
|
||||
},
|
||||
"xdph": {
|
||||
"inputs": {
|
||||
"hyprland-protocols": "hyprland-protocols_2",
|
||||
"nixpkgs": [
|
||||
"hyprland",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1671837878,
|
||||
"narHash": "sha256-OmFDyktTc/l+3wHboHeFpAQgPt3r7jjqZf8MrwuUGMo=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "xdg-desktop-portal-hyprland",
|
||||
"rev": "e47f4cec698080768821b271510985ab94a37e91",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "hyprwm",
|
||||
"repo": "xdg-desktop-portal-hyprland",
|
||||
"type": "github"
|
||||
}
|
||||
}
|
||||
},
|
||||
"root": "root",
|
||||
|
|
|
|||
49
flake.nix
49
flake.nix
|
|
@ -8,7 +8,7 @@
|
|||
inputs = {
|
||||
master.url = "github:nixos/nixpkgs";
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
|
||||
stable.url = "github:nixos/nixpkgs/nixos-22.05";
|
||||
stable.url = "github:nixos/nixpkgs/nixos-22.11";
|
||||
|
||||
pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix";
|
||||
|
||||
|
|
@ -29,17 +29,6 @@
|
|||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
comma = {
|
||||
url = "github:nix-community/comma";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
# Fish specific
|
||||
dracula-fish = {
|
||||
url = "github:dracula/fish";
|
||||
flake = false;
|
||||
};
|
||||
|
||||
# Zsh specific
|
||||
forgit-git = {
|
||||
url = "github:wfxr/forgit";
|
||||
|
|
@ -57,13 +46,16 @@
|
|||
flake = false;
|
||||
};
|
||||
|
||||
# Theming
|
||||
base16 = {
|
||||
url = "github:SenchoPens/base16.nix";
|
||||
howdy = {
|
||||
url = "sourcehut:~moritzboehme/howdy";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
howdy.url = "git+https://git.sr.ht/~moritzboehme/howdy";
|
||||
|
||||
# Hyprland
|
||||
hyprland.url = "github:hyprwm/Hyprland";
|
||||
hyprpaper.url = "github:hyprwm/hyprpaper";
|
||||
hypr-contrib.url = "github:hyprwm/contrib";
|
||||
};
|
||||
|
||||
outputs =
|
||||
|
|
@ -71,20 +63,33 @@
|
|||
utils.lib.mkFlake {
|
||||
inherit self inputs;
|
||||
|
||||
supportedSystems = [ "x86_64-linux" ];
|
||||
|
||||
channelsConfig.allowUnfree = true;
|
||||
|
||||
################
|
||||
### Overlays ###
|
||||
################
|
||||
|
||||
overlays.default = import ./overlays { inherit inputs; };
|
||||
overlay = import ./overlays { inherit inputs; };
|
||||
|
||||
channels.nixpkgs.overlaysBuilder = channels: [
|
||||
self.overlays.default
|
||||
inputs.utils.overlay
|
||||
inputs.agenix.overlay
|
||||
inputs.emacs-overlay.overlay
|
||||
inputs.howdy.overlays.default
|
||||
inputs.hypr-contrib.overlays.default
|
||||
inputs.hyprland.overlays.default
|
||||
inputs.hyprpaper.overlays.default
|
||||
inputs.utils.overlay
|
||||
self.overlay
|
||||
];
|
||||
|
||||
# overlays = utils.lib.exportOverlays {
|
||||
# inherit (self) pkgs inputs;
|
||||
# };
|
||||
|
||||
overlays.default = self.overlay;
|
||||
|
||||
###############
|
||||
### Modules ###
|
||||
###############
|
||||
|
|
@ -107,16 +112,18 @@
|
|||
extraSpecialArgs = { inherit inputs self; };
|
||||
};
|
||||
}
|
||||
inputs.hyprland.nixosModules.default
|
||||
inputs.agenix.nixosModules.age
|
||||
inputs.base16.nixosModule
|
||||
inputs.howdy.nixosModules.default
|
||||
];
|
||||
|
||||
hosts.nixos-laptop.modules = [
|
||||
./hosts/nixos-laptop
|
||||
self.nixosModules.desktop
|
||||
self.nixosModules.gaming
|
||||
];
|
||||
|
||||
|
||||
hosts.nixos-desktop.modules = [
|
||||
./hosts/nixos-desktop
|
||||
self.nixosModules.desktop
|
||||
|
|
@ -153,6 +160,8 @@
|
|||
shellcheck.enable = true;
|
||||
};
|
||||
};
|
||||
|
||||
packages = utils.lib.exportPackages self.overlays channels;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
{ lib
|
||||
, config
|
||||
, pkgs
|
||||
, inputs
|
||||
, ...
|
||||
}: {
|
||||
imports = [
|
||||
|
|
@ -11,9 +12,10 @@
|
|||
./hardware-configuration.nix
|
||||
];
|
||||
|
||||
my.programs.hyprland.nvidiaSupport = true;
|
||||
|
||||
# KERNEL
|
||||
# HACK to get nvidia driver to build
|
||||
# boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||
boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||
|
||||
# BOOT
|
||||
boot = {
|
||||
|
|
@ -58,13 +60,13 @@
|
|||
nohook resolv.conf
|
||||
'';
|
||||
};
|
||||
|
||||
hardware.nvidia.modesetting.enable = true;
|
||||
services.xserver.videoDrivers = [ "nvidia" ];
|
||||
hardware.opengl = {
|
||||
enable = true;
|
||||
driSupport32Bit = true;
|
||||
driSupport = true;
|
||||
};
|
||||
hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.legacy_470;
|
||||
services.xserver.xrandrHeads = [
|
||||
{ output = "HDMI-1"; }
|
||||
{
|
||||
|
|
|
|||
|
|
@ -11,10 +11,10 @@
|
|||
./hardware-configuration.nix
|
||||
];
|
||||
|
||||
services.howdy = {
|
||||
enable = true;
|
||||
certainty = 3.0;
|
||||
};
|
||||
# services.howdy = {
|
||||
# enable = true;
|
||||
# certainty = 3.0;
|
||||
# };
|
||||
|
||||
# BOOT
|
||||
boot = {
|
||||
|
|
|
|||
|
|
@ -51,12 +51,14 @@ in
|
|||
"https://jupyterwith.cachix.org"
|
||||
"https://nix-community.cachix.org"
|
||||
"https://pre-commit-hooks.cachix.org"
|
||||
"https://hyprland.cachix.org"
|
||||
];
|
||||
trusted-public-keys = [
|
||||
"jupyterwith.cachix.org-1:/kDy2B6YEhXGJuNguG1qyqIodMyO4w8KwWH4/vAc7CI="
|
||||
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
|
||||
"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
|
||||
"pre-commit-hooks.cachix.org-1:Pkk3Panw5AW24TOv6kz3PvLhlH8puAsJTBbOPmBo7Rc="
|
||||
"hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
|
||||
];
|
||||
|
||||
trusted-users = [ "root" "@wheel" ];
|
||||
|
|
|
|||
|
|
@ -41,15 +41,15 @@ in
|
|||
monitor = "\${env:MONITOR}";
|
||||
bottom = true;
|
||||
width = "100%";
|
||||
heigth = 20;
|
||||
heigth = 15;
|
||||
|
||||
border-size = 5;
|
||||
border-size = 2;
|
||||
|
||||
separator = " ";
|
||||
|
||||
font-0 = "FiraCode Nerd Font:size=9;0";
|
||||
font-1 = "FiraCode Nerd Font:size=9;1";
|
||||
font-2 = "FiraCode Nerd Font:size=9;2";
|
||||
font-0 = "FiraCode Nerd Font:size=8;0";
|
||||
font-1 = "FiraCode Nerd Font:size=8;1";
|
||||
font-2 = "FiraCode Nerd Font:size=8;2";
|
||||
|
||||
modules-left = "cpu memory network battery";
|
||||
modules-center = "bspwm";
|
||||
|
|
|
|||
|
|
@ -39,9 +39,9 @@ with lib;
|
|||
rm = "rm -i";
|
||||
mv = "mv -i";
|
||||
|
||||
nix-switch = "sudo nixos-rebuild switch --flake ~/.dotfiles";
|
||||
nix-boot = "sudo nixos-rebuild boot --flake ~/.dotfiles";
|
||||
nix-lock = "pushd ~/.dotfiles && nix flake update && popd";
|
||||
nixos-switch = "sudo nixos-rebuild switch --flake ~/.dotfiles";
|
||||
nixos-boot = "sudo nixos-rebuild boot --flake ~/.dotfiles";
|
||||
nixos-update = "pushd ~/.dotfiles && nix flake update && popd";
|
||||
|
||||
latexwatch = ''find -type f -name "*.tex" | entr -c latexmk -pdf -silent'';
|
||||
};
|
||||
|
|
@ -93,6 +93,7 @@ with lib;
|
|||
hut
|
||||
lazygit
|
||||
neofetch
|
||||
ripgrep
|
||||
tmux
|
||||
ttyper
|
||||
up
|
||||
|
|
@ -102,13 +103,14 @@ with lib;
|
|||
|
||||
fonts.fonts = with pkgs; [
|
||||
(nerdfonts.override {
|
||||
fonts = [ "FiraCode" "DroidSansMono" "JetBrainsMono" ];
|
||||
fonts = [ "FiraCode" ];
|
||||
})
|
||||
];
|
||||
|
||||
programs = {
|
||||
mtr.enable = true;
|
||||
command-not-found.enable = true;
|
||||
starship.enable = true;
|
||||
};
|
||||
|
||||
services = {
|
||||
|
|
@ -130,7 +132,6 @@ with lib;
|
|||
# Let Home Manager install and manage itself.
|
||||
home-manager.enable = true;
|
||||
fzf.enable = true;
|
||||
starship.enable = true;
|
||||
};
|
||||
home = {
|
||||
username = "moritz";
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ with lib; {
|
|||
|
||||
programs = {
|
||||
adb.enable = true;
|
||||
bspwm.enable = true;
|
||||
hyprland.enable = true;
|
||||
code.enable = true;
|
||||
emacs.enable = true;
|
||||
firefox = {
|
||||
|
|
@ -95,17 +95,11 @@ with lib; {
|
|||
mullvad.enable = true;
|
||||
openconnect.enable = true;
|
||||
openvpn.enable = true;
|
||||
picom.enable = true;
|
||||
printing.enable = true;
|
||||
redshift.enable = true;
|
||||
};
|
||||
};
|
||||
|
||||
programs.xss-lock = {
|
||||
enable = true;
|
||||
lockerCommand = "${pkgs.i3lock-fancy-rapid}/bin/i3lock-fancy-rapid 10 5";
|
||||
};
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
# nix
|
||||
nixpkgs-review
|
||||
|
|
@ -113,7 +107,7 @@ with lib; {
|
|||
# ripping
|
||||
abcde
|
||||
handbrake
|
||||
stable.picard # HACK to fix broken picard 2.8.3
|
||||
picard
|
||||
|
||||
# other
|
||||
anki
|
||||
|
|
@ -127,10 +121,15 @@ with lib; {
|
|||
vlc
|
||||
thunderbird
|
||||
plantuml
|
||||
|
||||
jetbrains.pycharm-professional
|
||||
|
||||
synology-drive-client
|
||||
];
|
||||
|
||||
programs.chromium.enable = true;
|
||||
|
||||
home-manager.users.moritz = {
|
||||
services.unclutter.enable = true;
|
||||
services.nextcloud-client = {
|
||||
enable = true;
|
||||
startInBackground = true;
|
||||
|
|
|
|||
|
|
@ -8,5 +8,6 @@
|
|||
lutris
|
||||
legendary-gl
|
||||
heroic
|
||||
mangohud
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -51,6 +51,7 @@ in
|
|||
extraConfig = builtins.readFile ./bspwmrc;
|
||||
};
|
||||
services = {
|
||||
unclutter.enable = true;
|
||||
sxhkd = {
|
||||
enable = true;
|
||||
extraConfig = builtins.readFile ./sxhkdrc;
|
||||
|
|
@ -75,6 +76,12 @@ in
|
|||
};
|
||||
};
|
||||
};
|
||||
|
||||
programs.xss-lock = {
|
||||
enable = true;
|
||||
lockerCommand = "${pkgs.i3lock-fancy-rapid}/bin/i3lock-fancy-rapid 10 5";
|
||||
};
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
bc # HACK to get bsp-layout to work
|
||||
brightnessctl
|
||||
|
|
|
|||
|
|
@ -32,5 +32,6 @@
|
|||
./xmonad
|
||||
./zathura.nix
|
||||
./zsh.nix
|
||||
./hyprland
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
with lib;
|
||||
let
|
||||
cfg = config.my.programs.emacs;
|
||||
myEmacs = with pkgs; ((emacsPackagesFor emacs).emacsWithPackages
|
||||
myEmacs = with pkgs; ((emacsPackagesFor emacsPgtk).emacsWithPackages
|
||||
(epkgs: [ epkgs.vterm ]));
|
||||
in
|
||||
{
|
||||
|
|
@ -16,72 +16,25 @@ in
|
|||
|
||||
config = mkIf cfg.enable {
|
||||
my.shell.aliases = {
|
||||
emacs = "emacsclient -t -a 'emacs -t'";
|
||||
emacs = "emacsclient -nw -a 'emacs -nw'";
|
||||
};
|
||||
fonts.fonts = [ pkgs.emacs-all-the-icons-fonts ];
|
||||
environment.systemPackages = with pkgs; [
|
||||
### Emacs itself
|
||||
binutils # native-comp needs 'as', provided by this
|
||||
fonts.fonts = with pkgs; [
|
||||
emacs-all-the-icons-fonts
|
||||
(iosevka-bin.override { variant = "aile"; })
|
||||
];
|
||||
users.users.moritz.packages = with pkgs; [
|
||||
myEmacs
|
||||
|
||||
### Doom dependencies
|
||||
git
|
||||
(ripgrep.override { withPCRE2 = true; })
|
||||
gnutls # for TLS connectivity
|
||||
|
||||
### Optional dependencies
|
||||
fd # faster projectile indexing
|
||||
imagemagick # for image-dired
|
||||
zstd # for undo-fu-session/undo-tree compression
|
||||
|
||||
### Module dependencies
|
||||
## :checkers
|
||||
# spell
|
||||
# flyspell
|
||||
(hunspellWithDicts [
|
||||
hunspellDicts.en_GB-ize
|
||||
hunspellDicts.en_US
|
||||
hunspellDicts.de_DE
|
||||
])
|
||||
|
||||
# grammar
|
||||
languagetool
|
||||
|
||||
## : tools
|
||||
# lookup & org +roam
|
||||
sqlite
|
||||
gcc # HACK to get emacsqlite binary
|
||||
wordnet
|
||||
graphviz
|
||||
|
||||
## :lang
|
||||
# latex & org (latex previews)
|
||||
stable.texlive.combined.scheme-full # HACK to fix broken perl package
|
||||
texlab
|
||||
|
||||
# nix
|
||||
nixfmt # for formating nix
|
||||
rnix-lsp
|
||||
|
||||
# markdown & org +pandoc
|
||||
pandoc
|
||||
|
||||
# python
|
||||
nodePackages.pyright
|
||||
|
||||
# sh
|
||||
nodePackages.bash-language-server
|
||||
|
||||
## :email
|
||||
# mu4e
|
||||
mu
|
||||
isync
|
||||
|
||||
## :app
|
||||
# everywhere
|
||||
xdotool
|
||||
xorg.xwininfo
|
||||
xclip
|
||||
xorg.xprop
|
||||
# language servers
|
||||
nil
|
||||
];
|
||||
home-manager.users.moritz = {
|
||||
home.sessionPath = [ "/home/moritz/.config/emacs/bin/" ];
|
||||
|
|
|
|||
|
|
@ -73,12 +73,6 @@ in
|
|||
fish_greeting = "";
|
||||
cheat = "cht.sh $argv | bat -p";
|
||||
};
|
||||
plugins = [
|
||||
{
|
||||
name = "dracula";
|
||||
src = inputs.dracula-fish;
|
||||
}
|
||||
];
|
||||
};
|
||||
fzf.enableFishIntegration = true;
|
||||
starship.enableFishIntegration = true;
|
||||
|
|
|
|||
|
|
@ -8,7 +8,12 @@ with lib;
|
|||
let
|
||||
cfg = config.my.programs.gnome;
|
||||
|
||||
extensions = with pkgs.gnomeExtensions; [ tray-icons-reloaded gsconnect ];
|
||||
extensions = with pkgs.gnomeExtensions; [
|
||||
gsconnect
|
||||
vitals
|
||||
gtile
|
||||
blur-my-shell
|
||||
];
|
||||
in
|
||||
{
|
||||
options.my.programs.gnome.enable = mkEnableOption "gnome";
|
||||
|
|
@ -21,7 +26,6 @@ in
|
|||
};
|
||||
pulseaudio.enable = false;
|
||||
};
|
||||
programs.xwayland.enable = true;
|
||||
services.xserver = {
|
||||
layout = "de";
|
||||
displayManager = {
|
||||
|
|
@ -36,8 +40,12 @@ in
|
|||
};
|
||||
environment.systemPackages = extensions;
|
||||
home-manager.users.moritz.dconf.settings = {
|
||||
"org/gnome/shell".enabled-extensions = map (p: p.extensionUuid or p.uuid) extensions;
|
||||
"org/gnome/shell" = {
|
||||
disable-user-extensions = false;
|
||||
enabled-extensions = map (p: p.extensionUuid or p.uuid) extensions;
|
||||
};
|
||||
"org/gnome/desktop/interface".enable-hot-corners = false;
|
||||
"org/gnome/desktop/wm/preferences".focus-mode = "sloppy";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
201
modules/programs/hyprland/config.nix
Normal file
201
modules/programs/hyprland/config.nix
Normal file
|
|
@ -0,0 +1,201 @@
|
|||
{ config
|
||||
, lib
|
||||
, pkgs
|
||||
, ...
|
||||
}:
|
||||
|
||||
with lib;
|
||||
let
|
||||
mkRule = rule: windowRegexes: "windowrulev2 = ${rule},${concatStringsSep "," windowRegexes}";
|
||||
mkRules = rules: windowRegexes: concatStringsSep "\n" (map (flip mkRule windowRegexes) rules);
|
||||
in
|
||||
''
|
||||
#
|
||||
# Please note not all available settings / options are set here.
|
||||
# For a full list, see the wiki
|
||||
#
|
||||
|
||||
# See https://wiki.hyprland.org/Configuring/Monitors/
|
||||
monitor=,preferred,auto,1
|
||||
|
||||
# See https://wiki.hyprland.org/Configuring/Keywords/ for more
|
||||
|
||||
# For all categories, see https://wiki.hyprland.org/Configuring/Variables/
|
||||
input {
|
||||
kb_layout = de,us
|
||||
kb_variant =
|
||||
kb_model =
|
||||
kb_options = grp:win_space_toggle,caps:escape
|
||||
kb_rules =
|
||||
|
||||
follow_mouse = 1
|
||||
|
||||
touchpad {
|
||||
natural_scroll = yes
|
||||
}
|
||||
|
||||
sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
|
||||
}
|
||||
|
||||
general {
|
||||
# See https://wiki.hyprland.org/Configuring/Variables/ for more
|
||||
|
||||
gaps_in = 5
|
||||
gaps_out = 5
|
||||
border_size = 2
|
||||
col.active_border = rgba(1affffee)
|
||||
col.inactive_border = rgba(595959aa)
|
||||
|
||||
cursor_inactive_timeout = 1
|
||||
|
||||
layout = dwindle
|
||||
}
|
||||
|
||||
decoration {
|
||||
# See https://wiki.hyprland.org/Configuring/Variables/ for more
|
||||
|
||||
rounding = 3
|
||||
blur = yes
|
||||
blur_size = 3
|
||||
blur_passes = 3
|
||||
blur_new_optimizations = on
|
||||
|
||||
drop_shadow = yes
|
||||
shadow_range = 10
|
||||
shadow_render_power = 2
|
||||
|
||||
# col.shadow = rgba(1a1a1aee)
|
||||
}
|
||||
|
||||
animations {
|
||||
enabled = yes
|
||||
|
||||
# Some default Lanimations, see https://wiki.hyprland.org/Configuring/Animations/ for more
|
||||
|
||||
bezier = myBezier, 0.45, 0, 0.55, 1
|
||||
|
||||
animation = windows, 1, 3, myBezier
|
||||
animation = windowsOut, 1, 3, myBezier
|
||||
animation = border, 1, 3, myBezier
|
||||
animation = fade, 1, 3, myBezier
|
||||
animation = workspaces, 1, 3, myBezier
|
||||
}
|
||||
|
||||
dwindle {
|
||||
# See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more
|
||||
pseudotile = yes # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
|
||||
preserve_split = yes # you probably want this
|
||||
no_gaps_when_only = true
|
||||
}
|
||||
|
||||
master {
|
||||
# See https://wiki.hyprland.org/Configuring/Master-Layout/ for more
|
||||
no_gaps_when_only = true
|
||||
new_is_master = false
|
||||
}
|
||||
|
||||
gestures {
|
||||
# See https://wiki.hyprland.org/Configuring/Variables/ for more
|
||||
workspace_swipe = on
|
||||
}
|
||||
|
||||
# Example per-device config
|
||||
# See https://wiki.hyprland.org/Configuring/Keywords/#executing for more
|
||||
device:epic mouse V1 {
|
||||
sensitivity = -0.5
|
||||
}
|
||||
|
||||
# Example windowrule v2
|
||||
# windowrulev2 = float,class:^(kitty)$,title:^(kitty)$
|
||||
# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
|
||||
|
||||
# Kitty
|
||||
windowrulev2 = opacity 0.95 0.95, class:^kitty$
|
||||
|
||||
windowrulev2 = opacity 0.85 0.85, floating:1
|
||||
|
||||
# Firefox Sharing Indicator
|
||||
${mkRules ["float" "move 49% 40" "noborder"] ["title:^(.*Sharing Indicator)$"]}
|
||||
|
||||
# Rofi
|
||||
${mkRules ["float" "opacity 0.85 0.85" "noborder"] ["class:^([rR]ofi)$"]}
|
||||
|
||||
# Emacs
|
||||
windowrulev2 = opaque, class:^emacs$
|
||||
|
||||
|
||||
# Fullscreen Applications
|
||||
# ${mkRules ["opaque" "noblur" "noborder" "noshadow" "forceinput"] ["fullscreen:1"]}
|
||||
|
||||
# See https://wiki.hyprland.org/Configuring/Keywords/ for more
|
||||
$mainMod = SUPER
|
||||
$windowMod = ALT
|
||||
|
||||
# Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
|
||||
bind = $mainMod, D, exec, hyprctl keyword general:layout dwindle
|
||||
bind = $mainMod, E, exec, emacsclient -c -a emacs
|
||||
bind = $mainMod, F, togglefloating,
|
||||
bind = $mainMod SHIFT, F, fullscreen,
|
||||
bind = $mainMod, M, exec, hyprctl keyword general:layout master
|
||||
bind = $mainMod, P, pseudo, # dwindle
|
||||
bind = $mainMod, Q, killactive,
|
||||
bind = $mainMod, R, exec, rofi -x11 -show combi
|
||||
bind = $mainMod, C, exec, rofi -x11 -show calc -modi calc -no-show-match -no-sort | wl-copy
|
||||
bind = $mainMod, B, exec, rofi-bluetooth
|
||||
bind = $mainMod, RETURN, exec, kitty
|
||||
bind = $mainMod, T, togglesplit, # dwindle
|
||||
bind = , XF86AudioLowerVolume, exec, pamixer -d 5
|
||||
bind = , XF86AudioMute, exec, pamixer -t
|
||||
bind = , XF86AudioNext, exec, playerctl -p "spotifyd,firefox" next
|
||||
bind = , XF86AudioPlay, exec, playerctl -p "spotifyd,firefox" play-pause
|
||||
bind = , XF86AudioPrev, exec, playerctl -p "spotifyd,firefox" previous
|
||||
bind = , XF86AudioRaiseVolume, exec, pamixer -i 5
|
||||
bind = , XF86MonBrightnessDown, exec, brightnessctl s 10%-
|
||||
bind = , XF86MonBrightnessUp, exec, brightnessctl s 10%+
|
||||
|
||||
# Move focus with mainMod + hjkl
|
||||
bind = $mainMod, H, movefocus, l
|
||||
bind = $mainMod, L, movefocus, r
|
||||
bind = $mainMod, K, movefocus, u
|
||||
bind = $mainMod, J, movefocus, d
|
||||
|
||||
# Change current active window size with mainMod + hjkl
|
||||
bind = $mainMod SHIFT, H, resizeactive, -10 0
|
||||
bind = $mainMod SHIFT, L, resizeactive, 10 0
|
||||
bind = $mainMod SHIFT, K, resizeactive, 0 -10
|
||||
bind = $mainMod SHIFT, J, resizeactive, 0 10
|
||||
|
||||
# Switch workspaces with mainMod + [0-9]
|
||||
bind = $mainMod, 1, workspace, 1
|
||||
bind = $mainMod, 2, workspace, 2
|
||||
bind = $mainMod, 3, workspace, 3
|
||||
bind = $mainMod, 4, workspace, 4
|
||||
bind = $mainMod, 5, workspace, 5
|
||||
bind = $mainMod, 6, workspace, 6
|
||||
bind = $mainMod, 7, workspace, 7
|
||||
bind = $mainMod, 8, workspace, 8
|
||||
bind = $mainMod, 9, workspace, 9
|
||||
bind = $mainMod, 0, workspace, 10
|
||||
|
||||
# Move active window to a workspace with mainMod + SHIFT + [0-9]
|
||||
bind = $mainMod SHIFT, 1, movetoworkspace, 1
|
||||
bind = $mainMod SHIFT, 2, movetoworkspace, 2
|
||||
bind = $mainMod SHIFT, 3, movetoworkspace, 3
|
||||
bind = $mainMod SHIFT, 4, movetoworkspace, 4
|
||||
bind = $mainMod SHIFT, 5, movetoworkspace, 5
|
||||
bind = $mainMod SHIFT, 6, movetoworkspace, 6
|
||||
bind = $mainMod SHIFT, 7, movetoworkspace, 7
|
||||
bind = $mainMod SHIFT, 8, movetoworkspace, 8
|
||||
bind = $mainMod SHIFT, 9, movetoworkspace, 9
|
||||
bind = $mainMod SHIFT, 0, movetoworkspace, 10
|
||||
|
||||
# Scroll through existing workspaces with mainMod + scroll
|
||||
bind = $mainMod, mouse_down, workspace, e+1
|
||||
bind = $mainMod, mouse_up, workspace, e-1
|
||||
|
||||
# Move/resize windows with mainMod + LMB/RMB and dragging
|
||||
bindm = $mainMod, mouse:272, movewindow
|
||||
bindm = $mainMod, mouse:273, resizewindow
|
||||
|
||||
exec-once=synology-drive
|
||||
''
|
||||
173
modules/programs/hyprland/default.nix
Normal file
173
modules/programs/hyprland/default.nix
Normal file
|
|
@ -0,0 +1,173 @@
|
|||
{ config
|
||||
, lib
|
||||
, pkgs
|
||||
, inputs
|
||||
, ...
|
||||
} @ args:
|
||||
|
||||
with lib;
|
||||
let
|
||||
cfg = config.my.programs.hyprland;
|
||||
|
||||
hyprland = pkgs.hyprland.override { nvidiaPatches = cfg.nvidiaSupport; };
|
||||
in
|
||||
{
|
||||
options.my.programs.hyprland = {
|
||||
enable = mkEnableOption "hyprland";
|
||||
nvidiaSupport = mkEnableOption "enable nvidia Support";
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
home-manager.users.moritz = {
|
||||
imports = [ inputs.hyprland.homeManagerModules.default ];
|
||||
|
||||
programs.waybar = {
|
||||
enable = true;
|
||||
package = pkgs.waybar-hyprland;
|
||||
systemd = {
|
||||
enable = true;
|
||||
target = "hyprland-session.target";
|
||||
};
|
||||
settings = {
|
||||
mainBar = {
|
||||
layer = "top";
|
||||
position = "top";
|
||||
height = 30;
|
||||
output = [
|
||||
"eDP-1"
|
||||
"HDMI-A-1"
|
||||
"HDMI-A-2"
|
||||
];
|
||||
modules-left = [ "wlr/workspaces" ];
|
||||
modules-center = [ "hyprland/window" ];
|
||||
modules-right = [ "network" "memory" "cpu" "battery" "clock" ];
|
||||
modules = {
|
||||
"wlr/workspaces" = {
|
||||
on-click = "activate";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
wayland.windowManager.hyprland = {
|
||||
enable = true;
|
||||
package = hyprland;
|
||||
extraConfig = import ./config.nix args;
|
||||
};
|
||||
|
||||
services.swayidle = {
|
||||
enable = true;
|
||||
events = [
|
||||
{
|
||||
event = "before-sleep";
|
||||
command = "${pkgs.swaylock-effects}/bin/swaylock -fF";
|
||||
}
|
||||
{
|
||||
event = "lock";
|
||||
command = "${pkgs.swaylock-effects}/bin/swaylock -fF";
|
||||
}
|
||||
];
|
||||
timeouts = [
|
||||
{
|
||||
timeout = 300;
|
||||
command = "${hyprland}/bin/hyprctl dispatch dpms off";
|
||||
resumeCommand = "${hyprland}/bin/hyprctl dispatch dpms on";
|
||||
}
|
||||
{
|
||||
timeout = 310;
|
||||
command = "${pkgs.systemd}/bin/loginctl lock-session";
|
||||
}
|
||||
];
|
||||
};
|
||||
# start swayidle as part of hyprland, not sway
|
||||
systemd.user.services.swayidle.Install.WantedBy = lib.mkForce [ "hyprland-session.target" ];
|
||||
|
||||
xdg.configFile."hypr/hyprpaper.conf" = {
|
||||
text =
|
||||
let
|
||||
setWallpaper = wallpaper: ''
|
||||
preload = ${wallpaper}
|
||||
wallpaper = ,${wallpaper}
|
||||
'';
|
||||
in
|
||||
setWallpaper "/home/moritz/.config/wallpapers/a_short_walk.png";
|
||||
onChange = "${pkgs.systemd}/bin/systemctl restart --user hyprpaper.service";
|
||||
};
|
||||
};
|
||||
systemd.user.services.hyprpaper = {
|
||||
enable = true;
|
||||
path = [ pkgs.hyprpaper ];
|
||||
wantedBy = [ "hyprland-session.target" ];
|
||||
after = [ "display-manager.service" ];
|
||||
script = "hyprpaper";
|
||||
};
|
||||
|
||||
users.users.moritz.packages = with pkgs; [
|
||||
swayidle
|
||||
swaylock-effects
|
||||
pamixer
|
||||
playerctl
|
||||
brightnessctl
|
||||
grimblast
|
||||
wl-clipboard
|
||||
];
|
||||
|
||||
security.pam.services.swaylock = { };
|
||||
|
||||
programs.hyprland = {
|
||||
enable = true;
|
||||
package = null;
|
||||
};
|
||||
|
||||
environment.sessionVariables =
|
||||
{
|
||||
XDG_CURRENT_DESKTOP = "Hyprland";
|
||||
XDG_SESSION_TYPE = "wayland";
|
||||
XDG_SESSION_DESKTOP = "Hyprland";
|
||||
QT_AUTO_SCREEN_SCALE_FACTOR = "1";
|
||||
QT_QPA_PLATFORM = "wayland;xcb";
|
||||
QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
|
||||
QT_QPA_PLATFORMTHEME = "qt5ct";
|
||||
_JAVA_AWT_WM_NONEREPARENTING = "1";
|
||||
} //
|
||||
(if cfg.nvidiaSupport then
|
||||
{
|
||||
LIBVA_DRIVER_NAME = "nvidia";
|
||||
XDG_SESSION_TYPE = "wayland";
|
||||
GBM_BACKEND = "nvidia-drm";
|
||||
__GLX_VENDOR_LIBRARY_NAME = "nvidia";
|
||||
WLR_NO_HARDWARE_CURSORS = "1";
|
||||
__GL_VRR_ALLOWED = "0";
|
||||
} else { });
|
||||
|
||||
services = {
|
||||
dbus.enable = true;
|
||||
pipewire = {
|
||||
enable = true;
|
||||
alsa.enable = true;
|
||||
alsa.support32Bit = true;
|
||||
pulse.enable = true;
|
||||
};
|
||||
xserver = {
|
||||
enable = true;
|
||||
displayManager = {
|
||||
lightdm.enable = true;
|
||||
autoLogin = {
|
||||
enable = true;
|
||||
user = "moritz";
|
||||
};
|
||||
defaultSession = "hyprland";
|
||||
sessionPackages = [ hyprland ];
|
||||
};
|
||||
};
|
||||
};
|
||||
security.rtkit.enable = true;
|
||||
|
||||
xdg.portal = {
|
||||
enable = true;
|
||||
wlr.enable = true;
|
||||
extraPortals = [ pkgs.xdg-desktop-portal-hyprland ];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -13,7 +13,7 @@ in
|
|||
|
||||
config = mkIf cfg.enable {
|
||||
users.users.moritz.packages = with pkgs; [
|
||||
logseq
|
||||
logseq-wayland
|
||||
];
|
||||
xdg.mime.defaultApplications."x-scheme-handler/logseq" = "logseq.desktop";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ in
|
|||
programs.rofi = {
|
||||
enable = true;
|
||||
package =
|
||||
pkgs.rofi.override { plugins = with pkgs; [ rofi-calc rofi-emoji ]; };
|
||||
pkgs.rofi-wayland.override { plugins = with pkgs; [ rofi-calc rofi-emoji ]; };
|
||||
extraConfig = { combi-modi = "drun,window,emoji"; };
|
||||
};
|
||||
xdg = {
|
||||
|
|
|
|||
|
|
@ -1,7 +1,22 @@
|
|||
{ inputs }: final: prev: {
|
||||
inherit (inputs.comma.packages."${prev.system}") comma;
|
||||
nixpkgs-review-checks = inputs.nixpkgs-review-checks.defaultPackage."${prev.system}";
|
||||
agenix = inputs.agenix.defaultPackage."${prev.system}";
|
||||
logseq-wayland = prev.symlinkJoin {
|
||||
name = "logseq-wayland";
|
||||
paths = [ prev.logseq ];
|
||||
nativeBuildInputs = [ prev.makeWrapper ];
|
||||
postBuild = ''
|
||||
wrapProgram $out/bin/logseq \
|
||||
--add-flags "--socket=wayland --enable-features=UseOzonePlatform --ozone-platform=wayland"
|
||||
'';
|
||||
};
|
||||
|
||||
waybar-hyprland = prev.waybar.overrideAttrs (old: {
|
||||
pname = "${old.pname}-hyprland";
|
||||
postPatch = old.postPatch or "" + ''
|
||||
sed -i 's,zext_workspace_handle_v1_activate(workspace_handle_);,const std::string command = "${final.hyprland}/bin/hyprctl dispatch workspace " + name_;\n\tsystem(command.c_str());,g' src/modules/wlr/workspace_manager.cpp
|
||||
'';
|
||||
mesonFlags = old.mesonFlags or [ ] ++ [ "-Dexperimental=true" ];
|
||||
});
|
||||
|
||||
master = import inputs.master {
|
||||
inherit (prev) system;
|
||||
config.allowUnfree = true;
|
||||
|
|
|
|||
|
|
@ -1,17 +1,18 @@
|
|||
age-encryption.org/v1
|
||||
-> ssh-ed25519 CjuqfA wMWvHzKojsGU5q8ElLz2IiwI0NvWZN6rPLL8nvIu9xE
|
||||
n0FjkxhJTOaG7RF6MEzaAz9ZWiP1trQHdNiaPCc5aCo
|
||||
-> ssh-ed25519 QRYDmg ChVNe6JXbocNnJnO0Y7XVrW0Tic5V5aIWuxGiG6pXnw
|
||||
FIDIKw6K0Y+WY5GJV262KTayMwxPCCBXMqXXMQruCPI
|
||||
-> ssh-ed25519 wG6LYg X/hbVXUoJNAkrgGz5MtyMjYRtBkF+FERXsRg1t8lFio
|
||||
x7zWga14+MZKbTQxRhoQjeBvuQOoG/uF6ZOW2XSgm/g
|
||||
-> ssh-ed25519 ZYd7Zg 2ONwuLBf5b3SrCdH+8ZiebO7KBqfKjan1Sw+LX/oTQ4
|
||||
bk6LwwvZ/i5UCxUakWA9J4MUT+3ENWMGAZyXpHRFMNI
|
||||
-> ssh-ed25519 as9VYQ H2i5xdWKf96tzdmTOZ0PHZciuZgSHSYTNxbvcQ3PzDs
|
||||
LRwILXh0IzTJrXJf2xa97m8cBV6KuvjDPWdeNTRZNdw
|
||||
-> G(S/7!"#-grease 0y 81:sY?B
|
||||
r6URopooo8jE5fqfSgjBHWrwDVMa0IwklhiWXsbMzgzBhac8DSDiGMEfXxKAFDFV
|
||||
GTFSR0sZoA
|
||||
--- QLqXqFiqJnIc1aMFvU0Giexu9m6E2ESU6kVpiu/vD5I
|
||||
9¦Æˆv’.“}Ÿr cdnqùüö7 ¶Ò|“nÍþ“Œ<E2809C>A4H<34><15>ú†±³›Ì¿PÀ…êó¯ùÐø4íÆÇ~
|
||||
8¶Ìm %¸ÿ‘꥟p'™diœ<69>µ9å7>ªr¿<72>¸xá˜\¨–KüeaxDž7²CtÉGlsæEðv÷<76>Å”I‡ Èc |¡C‡w±6ÍG%˜þ,%y¸æTñí…×áµÀÞ8
|
||||
-> ssh-ed25519 CjuqfA VN681gpv9+BTd6SAhmBuXZ4dnLocdkw3sdoK4sNeggY
|
||||
lnTROi2cjMdOS34HrOBjydsV2o2i31SZTFOE0w1Z4wQ
|
||||
-> ssh-ed25519 QRYDmg AEFJbJuGMYRpwFJ0ueCUc+jgU6hgpSqyvEjXnzcCPS4
|
||||
It+bPRBNuD6y03HyMkr+u+y1dLKXd/Iv6mpWGTa/ATg
|
||||
-> ssh-ed25519 wG6LYg 9n101tlrOmWcIMQ+Ejw1MauMdXKVPwh0Wpc6Kvys5TY
|
||||
Mk6Hp8uSpmClPxweTluUnQ7O+PNOyl4aZJJ++2UG/O0
|
||||
-> ssh-ed25519 ZYd7Zg bXnk/Ih6IWbodj6xFPJOw515+/L21xEaPgTy6wBBxlo
|
||||
0cPd3Pq99x3qJAafPjYUv7+XwncmMqTYIouqjoAQG+k
|
||||
-> ssh-ed25519 as9VYQ lbIvvkszmYr5ZVqtxR8mCS+bCqskk3+0yf8Mo/RtkX0
|
||||
IMY1Gqa7AXyAKCKUW8GTWSWaX3DN4Y5KN5b9JFvMrJI
|
||||
-> M.`tiyM-grease 4bHP!dW
|
||||
Bt8cOnxP0TP6pMYKg59Z
|
||||
--- hIrUz6vpXLb1Jhwlc91amUWXEQVM17TQt7zy24nFNeM
|
||||
ÃY\)fào‰`§ýuŸ+§À½u†5Û<;u
I¦<49>JqíÎçTÝìö <1F>Sƒ9S"MÝ <0C>.[1<T˜ÎSy 7Ї÷îa?PÈ
‘ÏÛÒb[¾“#ýœ ‰$
|
||||
HҬ
±´Økþm¥ lZ±ùBÌâ:UÙ•ü´£Zì{Hù
|
||||
ž™m›éßUþÀyÛ
!g–Úe ÷B¢ú"u¦%N iz|5
|
||||
ÂzÑsàJ±î½ÕȦÅl¡6§þÇ“tà±d¢²”
à]Øm‚êDøu[?=õœ²¥
|
||||
Loading…
Add table
Add a link
Reference in a new issue