updating to make hyprland use eww now that eww can use a systray
Also including tokei and scc to count code in my projects
This commit is contained in:
parent
587379ceea
commit
a1a62a54c1
|
@ -188,6 +188,10 @@ tooltip label {
|
||||||
margin: 0px 25px 0px 0px;
|
margin: 0px 25px 0px 0px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.tray {
|
||||||
|
margin: 0px 13px 0px 0px;
|
||||||
|
}
|
||||||
|
|
||||||
// ALL RIGHT MODULES
|
// ALL RIGHT MODULES
|
||||||
|
|
||||||
.vol_module, .bright_module {
|
.vol_module, .bright_module {
|
||||||
|
|
|
@ -258,7 +258,14 @@
|
||||||
:visible "true"
|
:visible "true"
|
||||||
:width "150"))
|
:width "150"))
|
||||||
|
|
||||||
|
(defwidget tray []
|
||||||
|
(systray
|
||||||
|
:class "tray"
|
||||||
|
:hexpand "false"
|
||||||
|
:halign "center"
|
||||||
|
:visible "true"
|
||||||
|
:spacing 10
|
||||||
|
:icon-size 20))
|
||||||
|
|
||||||
;;define widget groups
|
;;define widget groups
|
||||||
(defwidget left []
|
(defwidget left []
|
||||||
|
@ -300,9 +307,9 @@
|
||||||
(label
|
(label
|
||||||
:class "right_sep"
|
:class "right_sep"
|
||||||
:text "|")
|
:text "|")
|
||||||
|
(tray)
|
||||||
(wifi)
|
(wifi)
|
||||||
(notif_button)
|
(notif_button)))
|
||||||
(nextcloud_button)))
|
|
||||||
|
|
||||||
(defwidget bar_layout []
|
(defwidget bar_layout []
|
||||||
(centerbox
|
(centerbox
|
||||||
|
|
186
flake.lock
186
flake.lock
|
@ -46,11 +46,11 @@
|
||||||
"nixpkgs-stable": "nixpkgs-stable"
|
"nixpkgs-stable": "nixpkgs-stable"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1712108714,
|
"lastModified": 1712509449,
|
||||||
"narHash": "sha256-QzrcwGuuAP1octIcUw/d+Yi5BEXYt1NOwNLpeUrqKTk=",
|
"narHash": "sha256-W61ArwUi3gMNEDbAm511ZmtYmopZH23zPq2TJZSdrCQ=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "emacs-overlay",
|
"repo": "emacs-overlay",
|
||||||
"rev": "5d0a10938c32f3cb95d1f1f18127948d239c6720",
|
"rev": "f7fcac1403356fd09e2320bc3d61ccefe36c1b91",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -68,11 +68,11 @@
|
||||||
"rust-overlay": "rust-overlay"
|
"rust-overlay": "rust-overlay"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1711884036,
|
"lastModified": 1712401919,
|
||||||
"narHash": "sha256-DkJBMFUG8GLCoZ5yEXRDb4iWQjH+V6hrB4QQuRrn2F8=",
|
"narHash": "sha256-WcAWIvIdGE0tcS7WJ6JlbRlUnKvpvut500NozUmJ6jY=",
|
||||||
"owner": "elkowar",
|
"owner": "elkowar",
|
||||||
"repo": "eww",
|
"repo": "eww",
|
||||||
"rev": "149727ce1f7dd4f461ab1d61d560546f3d1f32a1",
|
"rev": "ebe5f349d184e79edc33199d064d9ec5f1e4dd9b",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -181,7 +181,7 @@
|
||||||
},
|
},
|
||||||
"flake-utils_3": {
|
"flake-utils_3": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"systems": "systems_5"
|
"systems": "systems_4"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1705309234,
|
"lastModified": 1705309234,
|
||||||
|
@ -198,15 +198,33 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"flake-utils_4": {
|
"flake-utils_4": {
|
||||||
|
"inputs": {
|
||||||
|
"systems": "systems_5"
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1710146030,
|
||||||
|
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "flake-utils",
|
||||||
|
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "flake-utils",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"flake-utils_5": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"systems": "systems_6"
|
"systems": "systems_6"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1709126324,
|
"lastModified": 1705309234,
|
||||||
"narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=",
|
"narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "flake-utils",
|
"repo": "flake-utils",
|
||||||
"rev": "d465f4819400de7c8d874d50b982301f28a84605",
|
"rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -222,11 +240,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1712093955,
|
"lastModified": 1712390667,
|
||||||
"narHash": "sha256-94I0sXz6fiVBvUAk2tg6t3UpM5rOImj4JTSTNFbg64s=",
|
"narHash": "sha256-ebq+fJZfobqpsAdGDGpxNWSySbQejRwW9cdiil6krCo=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "80546b220e95a575c66c213af1b09fe255299438",
|
"rev": "b787726a8413e11b074cde42704b4af32d95545c",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -238,7 +256,10 @@
|
||||||
},
|
},
|
||||||
"hyprcursor": {
|
"hyprcursor": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"hyprlang": "hyprlang",
|
"hyprlang": [
|
||||||
|
"hyprland",
|
||||||
|
"hyprlang"
|
||||||
|
],
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"hyprland",
|
"hyprland",
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
|
@ -249,11 +270,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1711466786,
|
"lastModified": 1712339458,
|
||||||
"narHash": "sha256-sArxGyUBiCA1in+q6t0QqT+ZJiZ1PyBp7cNPKLmREM0=",
|
"narHash": "sha256-j8pv3tL2EFLGuvFoO64dHWD8YzNvD77hRb4EEx5ADgE=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "hyprcursor",
|
"repo": "hyprcursor",
|
||||||
"rev": "d3876f34779cc03ee51e4aafc0d00a4f187c7544",
|
"rev": "981b6617822dadc40246a6c70194d02dfc12e4c6",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -266,18 +287,18 @@
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"hyprcursor": "hyprcursor",
|
"hyprcursor": "hyprcursor",
|
||||||
"hyprland-protocols": "hyprland-protocols",
|
"hyprland-protocols": "hyprland-protocols",
|
||||||
"hyprlang": "hyprlang_2",
|
"hyprlang": "hyprlang",
|
||||||
"nixpkgs": "nixpkgs",
|
"nixpkgs": "nixpkgs",
|
||||||
"systems": "systems_4",
|
"systems": "systems_3",
|
||||||
"wlroots": "wlroots",
|
"wlroots": "wlroots",
|
||||||
"xdph": "xdph"
|
"xdph": "xdph"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1712135388,
|
"lastModified": 1712507986,
|
||||||
"narHash": "sha256-IpJNUCvVFBKdEKsFL8GKBq0VUVSwn/kLrgXA+VW5hoA=",
|
"narHash": "sha256-Gd6VFiWNZlxExwVhVgC2IefYwONMtgb8EHj56W/Zl68=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "Hyprland",
|
"repo": "Hyprland",
|
||||||
"rev": "347b83903474ab9e95fa9d4ba123f6f78ab38d40",
|
"rev": "20899d0df2a2811d83b4ae3357ad31a94eafcd8e",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -298,11 +319,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1712058759,
|
"lastModified": 1712420644,
|
||||||
"narHash": "sha256-NRf7UmiOzz/FWmfNrzX30bIQ8vebyQLRgAjTxZa/FTs=",
|
"narHash": "sha256-h2X8qhN5RKYQXzT1kxKgUz1u1QthqOrP9xk800mTM6E=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "hyprland-plugins",
|
"repo": "hyprland-plugins",
|
||||||
"rev": "00519a43c11f3343a63a6fc15deb7f7bc5624324",
|
"rev": "5ec0140d4aeca42b8a33e7f335f979e376d1b549",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -337,29 +358,6 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"hyprlang": {
|
"hyprlang": {
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": [
|
|
||||||
"hyprland",
|
|
||||||
"hyprcursor",
|
|
||||||
"nixpkgs"
|
|
||||||
],
|
|
||||||
"systems": "systems_3"
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1709914708,
|
|
||||||
"narHash": "sha256-bR4o3mynoTa1Wi4ZTjbnsZ6iqVcPGriXp56bZh5UFTk=",
|
|
||||||
"owner": "hyprwm",
|
|
||||||
"repo": "hyprlang",
|
|
||||||
"rev": "a685493fdbeec01ca8ccdf1f3655c044a8ce2fe2",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "hyprwm",
|
|
||||||
"repo": "hyprlang",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"hyprlang_2": {
|
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"hyprland",
|
"hyprland",
|
||||||
|
@ -371,11 +369,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1711250455,
|
"lastModified": 1711671891,
|
||||||
"narHash": "sha256-LSq1ZsTpeD7xsqvlsepDEelWRDtAhqwetp6PusHXJRo=",
|
"narHash": "sha256-C/Wwsy/RLxHP1axFFl+AnwJRWfd8gxDKKoa8nt8Qk3c=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "hyprlang",
|
"repo": "hyprlang",
|
||||||
"rev": "b3e430f81f3364c5dd1a3cc9995706a4799eb3fa",
|
"rev": "c1402612146ba06606ebf64963a02bc1efe11e74",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -391,11 +389,11 @@
|
||||||
"nixpkgs": "nixpkgs_3"
|
"nixpkgs": "nixpkgs_3"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1711913683,
|
"lastModified": 1712491004,
|
||||||
"narHash": "sha256-G/FLkRDQUMki7QLXdegMYoJMgFa5bP0dmBv3LBxmCAc=",
|
"narHash": "sha256-1zeMP2rivZrJrvfle/m3Ohil+IPrD48I2befhwakNls=",
|
||||||
"owner": "chriscochrun",
|
"owner": "chriscochrun",
|
||||||
"repo": "lumina",
|
"repo": "lumina",
|
||||||
"rev": "1117d6eea2ebb50ac7b27c90e05d8078ab8db847",
|
"rev": "00fcf565efa8ae16ca127fbbc480b54f2bea91ab",
|
||||||
"type": "gitlab"
|
"type": "gitlab"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -430,11 +428,11 @@
|
||||||
"nixpkgs-unstable": "nixpkgs-unstable"
|
"nixpkgs-unstable": "nixpkgs-unstable"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1709627108,
|
"lastModified": 1712227415,
|
||||||
"narHash": "sha256-SlNuXat2lUO1O8HqDgpweTceSo4dZK8vhEhf8CWtgj8=",
|
"narHash": "sha256-4EvWs6rHxCIj9FFXI4Vxh32XJaZJfIqKtAal6vJfqAs=",
|
||||||
"owner": "fort-nix",
|
"owner": "fort-nix",
|
||||||
"repo": "nix-bitcoin",
|
"repo": "nix-bitcoin",
|
||||||
"rev": "502c73d5146623b8cb431563a7c15629a310d9b1",
|
"rev": "1a3748a368e96e3f3a38735bd9417f634beeeace",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -446,11 +444,11 @@
|
||||||
},
|
},
|
||||||
"nixos-hardware": {
|
"nixos-hardware": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1711352745,
|
"lastModified": 1712324865,
|
||||||
"narHash": "sha256-luvqik+i3HTvCbXQZgB6uggvEcxI9uae0nmrgtXJ17U=",
|
"narHash": "sha256-+BatEWd4HlMeK7Ora+gYIkarjxFVCg9oKrIeybHIIX4=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixos-hardware",
|
"repo": "nixos-hardware",
|
||||||
"rev": "9a763a7acc4cfbb8603bb0231fec3eda864f81c0",
|
"rev": "f3b959627bca46a9f7052b8fbc464b8323e68c2c",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -462,11 +460,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1711523803,
|
"lastModified": 1712163089,
|
||||||
"narHash": "sha256-UKcYiHWHQynzj6CN/vTcix4yd1eCu1uFdsuarupdCQQ=",
|
"narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "2726f127c15a4cc9810843b96cad73c7eb39e443",
|
"rev": "fd281bd6b7d3e32ddfa399853946f782553163b5",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -493,11 +491,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-stable": {
|
"nixpkgs-stable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1711668574,
|
"lastModified": 1712437997,
|
||||||
"narHash": "sha256-u1dfs0ASQIEr1icTVrsKwg2xToIpn7ZXxW3RHfHxshg=",
|
"narHash": "sha256-g0whLLwRvgO2FsyhY8fNk+TWenS3jg5UdlWL4uqgFeo=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "219951b495fc2eac67b1456824cc1ec1fd2ee659",
|
"rev": "e38d7cb66ea4f7a0eb6681920615dfcc30fc2920",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -509,11 +507,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-stable_2": {
|
"nixpkgs-stable_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1711668574,
|
"lastModified": 1712437997,
|
||||||
"narHash": "sha256-u1dfs0ASQIEr1icTVrsKwg2xToIpn7ZXxW3RHfHxshg=",
|
"narHash": "sha256-g0whLLwRvgO2FsyhY8fNk+TWenS3jg5UdlWL4uqgFeo=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "219951b495fc2eac67b1456824cc1ec1fd2ee659",
|
"rev": "e38d7cb66ea4f7a0eb6681920615dfcc30fc2920",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -525,11 +523,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-unstable": {
|
"nixpkgs-unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1709386671,
|
"lastModified": 1712026416,
|
||||||
"narHash": "sha256-VPqfBnIJ+cfa78pd4Y5Cr6sOWVW8GYHRVucxJGmRf8Q=",
|
"narHash": "sha256-N/3VR/9e1NlN49p7kCiATiEY6Tzdo+CbrAG8kqCQKcI=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "fa9a51752f1b5de583ad5213eb621be071806663",
|
"rev": "080a4a27f206d07724b88da096e27ef63401a504",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -571,11 +569,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_4": {
|
"nixpkgs_4": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1709309926,
|
"lastModified": 1711668574,
|
||||||
"narHash": "sha256-VZFBtXGVD9LWTecGi6eXrE0hJ/mVB3zGUlHImUs2Qak=",
|
"narHash": "sha256-u1dfs0ASQIEr1icTVrsKwg2xToIpn7ZXxW3RHfHxshg=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "79baff8812a0d68e24a836df0a364c678089e2c7",
|
"rev": "219951b495fc2eac67b1456824cc1ec1fd2ee659",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -587,11 +585,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_5": {
|
"nixpkgs_5": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1711703276,
|
"lastModified": 1712439257,
|
||||||
"narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=",
|
"narHash": "sha256-aSpiNepFOMk9932HOax0XwNxbA38GOUVOiXfUVPOrck=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "d8fe5e6c92d0d190646fb9f1056741a229980089",
|
"rev": "ff0dbd94265ac470dda06a657d5fe49de93b4599",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -629,6 +627,7 @@
|
||||||
"nixos-hardware": "nixos-hardware",
|
"nixos-hardware": "nixos-hardware",
|
||||||
"nixpkgs": "nixpkgs_5",
|
"nixpkgs": "nixpkgs_5",
|
||||||
"nixpkgs-stable": "nixpkgs-stable_2",
|
"nixpkgs-stable": "nixpkgs-stable_2",
|
||||||
|
"rust-overlay": "rust-overlay_2",
|
||||||
"simple-nixos-mailserver": "simple-nixos-mailserver"
|
"simple-nixos-mailserver": "simple-nixos-mailserver"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@ -654,6 +653,27 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"rust-overlay_2": {
|
||||||
|
"inputs": {
|
||||||
|
"flake-utils": "flake-utils_5",
|
||||||
|
"nixpkgs": [
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1712715149,
|
||||||
|
"narHash": "sha256-uOx7GaLV+5hekAYtm/CBr627Pi7+d1Yh70hwKmVjYYo=",
|
||||||
|
"owner": "oxalica",
|
||||||
|
"repo": "rust-overlay",
|
||||||
|
"rev": "9ef1eca23bee5fb8080863909af3802130b2ee57",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "oxalica",
|
||||||
|
"repo": "rust-overlay",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"simple-nixos-mailserver": {
|
"simple-nixos-mailserver": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"blobs": "blobs",
|
"blobs": "blobs",
|
||||||
|
@ -723,16 +743,16 @@
|
||||||
},
|
},
|
||||||
"systems_4": {
|
"systems_4": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1689347949,
|
"lastModified": 1681028828,
|
||||||
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
|
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||||
"owner": "nix-systems",
|
"owner": "nix-systems",
|
||||||
"repo": "default-linux",
|
"repo": "default",
|
||||||
"rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
|
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nix-systems",
|
"owner": "nix-systems",
|
||||||
"repo": "default-linux",
|
"repo": "default",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
17
flake.nix
17
flake.nix
|
@ -41,9 +41,22 @@
|
||||||
# url = "github:nixified-ai/flake";
|
# url = "github:nixified-ai/flake";
|
||||||
# inputs.nixpkgs.follows = "nixpkgs";
|
# inputs.nixpkgs.follows = "nixpkgs";
|
||||||
# };
|
# };
|
||||||
|
rust-overlay = {
|
||||||
|
url = "github:oxalica/rust-overlay";
|
||||||
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = { nixpkgs, nixpkgs-stable, home-manager, hyprland, nixos-hardware, emacs, nix-bitcoin, libre-presenter, anyrun, ... }:
|
outputs = { nixpkgs,
|
||||||
|
nixpkgs-stable,
|
||||||
|
home-manager,
|
||||||
|
hyprland,
|
||||||
|
nixos-hardware,
|
||||||
|
emacs,
|
||||||
|
nix-bitcoin,
|
||||||
|
libre-presenter,
|
||||||
|
eww,
|
||||||
|
rust-overlay, ... }:
|
||||||
let
|
let
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
username = "chris";
|
username = "chris";
|
||||||
|
@ -52,6 +65,8 @@
|
||||||
config = { allowUnfree = true; };
|
config = { allowUnfree = true; };
|
||||||
overlays = [
|
overlays = [
|
||||||
emacs.overlays.default
|
emacs.overlays.default
|
||||||
|
rust-overlay.overlays.default
|
||||||
|
eww.overlays.default
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -44,6 +44,13 @@ in
|
||||||
default = [
|
default = [
|
||||||
pkgs.xdg-desktop-portal-kde
|
pkgs.xdg-desktop-portal-kde
|
||||||
];
|
];
|
||||||
|
"org.freedesktop.impl.portal.FileChooser" = [ "kde" ];
|
||||||
|
};
|
||||||
|
hyprland = {
|
||||||
|
default = [
|
||||||
|
"hyprland"
|
||||||
|
];
|
||||||
|
"org.freedesktop.impl.portal.FileChooser" = [ "kde" ];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
extraPortals = [ pkgs.xdg-desktop-portal-kde ];
|
extraPortals = [ pkgs.xdg-desktop-portal-kde ];
|
||||||
|
|
|
@ -130,6 +130,7 @@ in
|
||||||
"size 60% 60%,dolphin"
|
"size 60% 60%,dolphin"
|
||||||
"float,mpv"
|
"float,mpv"
|
||||||
"size ${if laptop then "90% 76%" else "85% 85%"},mpv"
|
"size ${if laptop then "90% 76%" else "85% 85%"},mpv"
|
||||||
|
"${if laptop then "workspace 1,idk #dummy rule" else "workspace 1,mpv"}"
|
||||||
"center,mpv"
|
"center,mpv"
|
||||||
"opaque,mpv"
|
"opaque,mpv"
|
||||||
"float,pulsemixer"
|
"float,pulsemixer"
|
||||||
|
@ -243,13 +244,14 @@ in
|
||||||
];
|
];
|
||||||
|
|
||||||
# Blur waybar
|
# Blur waybar
|
||||||
blurls = "gtk-layer-shell";
|
# blurls = "gtk-layer-shell";
|
||||||
# blurls=notifications
|
# blurls=notifications
|
||||||
|
|
||||||
exec-once = [
|
exec-once = [
|
||||||
"kwalletd5"
|
"kwalletd5"
|
||||||
"swww init"
|
"eww daemon"
|
||||||
"waybar"
|
"swww-daemon --format xrgb"
|
||||||
|
"eww open bar0"
|
||||||
"dunst"
|
"dunst"
|
||||||
"rbw-agent"
|
"rbw-agent"
|
||||||
"/home/chris/bin/startup.sh"
|
"/home/chris/bin/startup.sh"
|
||||||
|
@ -272,256 +274,4 @@ in
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
# home.file.".config/hypr/hyprland.conf" = {
|
|
||||||
# text = ''
|
|
||||||
# monitor=eDP-1,2256x1504@60,0x0,1.566667
|
|
||||||
# monitor=HDMI-A-1,preferred,0x0,1
|
|
||||||
# monitor=DP-1,preferred,1080x0,1.5
|
|
||||||
# monitor=DP-2,preferred,3640,1
|
|
||||||
# workspace=1,monitor:eDP-1,1,default:true
|
|
||||||
# workspace=2,monitor:HDMI-A-1,2,default:true
|
|
||||||
# workspace=9,monitor:DP-2,9,gapsout:0,default:true
|
|
||||||
# workspace=1,monitor:DP-1,1,default:true
|
|
||||||
# workspace=special,monitor:DP-1,1,default:true
|
|
||||||
# monitor=HDMI-A-1,transform,1
|
|
||||||
|
|
||||||
# input {
|
|
||||||
# # kb_layout=
|
|
||||||
# # kb_variant=
|
|
||||||
# # kb_model=
|
|
||||||
# # kb_options=
|
|
||||||
# # kb_rules=
|
|
||||||
# repeat_rate=140
|
|
||||||
# repeat_delay=180
|
|
||||||
# natural_scroll=0
|
|
||||||
# sensitivity=0.75
|
|
||||||
# accel_profile=adaptive
|
|
||||||
|
|
||||||
# follow_mouse=2
|
|
||||||
# float_switch_override_focus=0
|
|
||||||
|
|
||||||
# touchpad {
|
|
||||||
# natural_scroll=1
|
|
||||||
# clickfinger_behavior=1
|
|
||||||
# }
|
|
||||||
# }
|
|
||||||
# xwayland {
|
|
||||||
# use_nearest_neighbor = false
|
|
||||||
# # force_zero_scaling = true
|
|
||||||
# }
|
|
||||||
# general {
|
|
||||||
# # main_mod=SUPER
|
|
||||||
|
|
||||||
# gaps_in=15
|
|
||||||
# gaps_out=20
|
|
||||||
# border_size=0
|
|
||||||
# col.active_border=0x66ee1111
|
|
||||||
# col.inactive_border=0x66333333
|
|
||||||
|
|
||||||
# #damage_tracking=full # leave it on full unless you hate your GPU and want to make it suffer
|
|
||||||
# layout=master
|
|
||||||
# no_cursor_warps=false
|
|
||||||
# }
|
|
||||||
|
|
||||||
# gestures {
|
|
||||||
# workspace_swipe=true
|
|
||||||
# workspace_swipe_fingers=3
|
|
||||||
# }
|
|
||||||
|
|
||||||
# decoration {
|
|
||||||
# rounding=18
|
|
||||||
# # multisample_edges=true
|
|
||||||
# active_opacity=0.97
|
|
||||||
# inactive_opacity=0.75
|
|
||||||
# fullscreen_opacity=1.0
|
|
||||||
|
|
||||||
# blur {
|
|
||||||
# enabled=true
|
|
||||||
# size=10 # minimum 1
|
|
||||||
# passes=3 # minimum 1, more passes = more resource intensive.
|
|
||||||
# new_optimizations=true
|
|
||||||
# ignore_opacity=false
|
|
||||||
# special=false
|
|
||||||
# }
|
|
||||||
|
|
||||||
# drop_shadow=true
|
|
||||||
# shadow_range=15
|
|
||||||
# shadow_offset=5 5
|
|
||||||
# shadow_scale=0.99
|
|
||||||
# shadow_render_power=1
|
|
||||||
# col.shadow = rgba(000000cc)
|
|
||||||
# dim_inactive=true
|
|
||||||
# dim_strength=0.2
|
|
||||||
# dim_special=0
|
|
||||||
# }
|
|
||||||
|
|
||||||
# bezier=snapslide,0.07,0.66,0.04,1.02
|
|
||||||
|
|
||||||
# animations {
|
|
||||||
# enabled=1
|
|
||||||
# animation=windows,1,2,snapslide
|
|
||||||
# # animation=borders,1,10,default
|
|
||||||
# animation=fadeIn,1,2,snapslide
|
|
||||||
# animation=workspaces,1,2,snapslide
|
|
||||||
# animation=specialWorkspace,1,2,snapslide,slidevert
|
|
||||||
# }
|
|
||||||
|
|
||||||
# dwindle {
|
|
||||||
# pseudotile=0 # enable pseudotiling on dwindle
|
|
||||||
# }
|
|
||||||
|
|
||||||
# master {
|
|
||||||
# special_scale_factor=0.8
|
|
||||||
# mfact=0.65
|
|
||||||
# new_is_master=false
|
|
||||||
# new_on_top=false
|
|
||||||
# }
|
|
||||||
|
|
||||||
# # misc:disable_autoreload = true
|
|
||||||
# misc {
|
|
||||||
# focus_on_activate = true
|
|
||||||
# mouse_move_enables_dpms = true
|
|
||||||
# key_press_enables_dpms = true
|
|
||||||
# disable_hyprland_logo = true
|
|
||||||
# }
|
|
||||||
|
|
||||||
# # example window rules
|
|
||||||
# # for windows named/classed as abc and xyz
|
|
||||||
# windowrule=opaque,firefox
|
|
||||||
# windowrule=float,dolphin
|
|
||||||
# windowrule=float,nm-tray
|
|
||||||
# windowrule=size 60% 60%,dolphin
|
|
||||||
# ${if laptop then "# this is a kaladin space" else "windowrule=workspace 1,mpv"}
|
|
||||||
# windowrule=float,mpv
|
|
||||||
# windowrule=size ${if laptop then "90% 76%" else "85% 85%"},mpv
|
|
||||||
# windowrule=center,mpv
|
|
||||||
# windowrule=opaque,mpv
|
|
||||||
# # windowrule=pin,mpv
|
|
||||||
# windowrule=float,pulsemixer
|
|
||||||
# windowrule=workspace ${if laptop then "2" else "1"},firefox
|
|
||||||
# windowrule=workspace ${if laptop then "1" else "2"},emacs
|
|
||||||
# windowrule=float,btop
|
|
||||||
# windowrule=size 70% 70%,btop
|
|
||||||
# windowrule=center,btop
|
|
||||||
# windowrule=float,lumina
|
|
||||||
# windowrule=size 80% 80%,lumina
|
|
||||||
# windowrule=center,lumina
|
|
||||||
# windowrule=workspace ${if laptop then "1" else "3"},title:presentation-window
|
|
||||||
|
|
||||||
# # example binds
|
|
||||||
# bind = SUPER,RETURN,exec,alacritty
|
|
||||||
# bind = SUPER,C,killactive,
|
|
||||||
# bind = SUPERSHIFT,Q,exit,
|
|
||||||
# bind = SUPERSHIFT,D,exec,dolphin
|
|
||||||
# bind = SUPERSHIFT,F,togglefloating,
|
|
||||||
# bindr = SUPER,Super_L,exec,/home/chris/bin/launcher.sh
|
|
||||||
# bindr = ALT,Alt_R,exec,/home/chris/bin/window.sh
|
|
||||||
# bind = SUPER,w,exec,/home/chris/bin/window.sh
|
|
||||||
# bind = SUPER,E,exec,/home/chris/bin/emacslof
|
|
||||||
# bind = SUPER,d,exec,emacsclient -c -e '(dired-jump)'
|
|
||||||
# bind = SUPER,v,exec,cliphist list | rofi -p " " -dmenu -theme ~/.config/rofi/launchers-git/laptop-rbw-wayland.rasi | cliphist decode | wl-copy
|
|
||||||
# bind = SUPER,B,exec,/home/chris/bin/fflof
|
|
||||||
# bind = SUPER,A,exec,alacritty --class pulsemixer -e pulsemixer
|
|
||||||
# bind = SUPERCTRL,i,exec,alacritty --class btop -e btm
|
|
||||||
# bind = ,Print,exec,screenshot
|
|
||||||
# bind = SUPERSHIFT,mouse_down,exec,zoomin in
|
|
||||||
# bind = SUPERSHIFT,mouse_up,exec,zoomin out
|
|
||||||
|
|
||||||
# bind = SUPER,P,exec,/home/chris/bin/rbw.sh
|
|
||||||
# bind = SUPER,M,fullscreen,1
|
|
||||||
# bind = SUPER,F,fullscreen,0
|
|
||||||
|
|
||||||
# bind = SUPER,h,movefocus,l
|
|
||||||
# bind = SUPER,l,movefocus,r
|
|
||||||
# bind = SUPER,k,layoutmsg,cycleprev
|
|
||||||
# bind = SUPER,j,layoutmsg,cyclenext
|
|
||||||
# bind = SUPERSHIFT,h,movewindow,l
|
|
||||||
# bind = SUPERSHIFT,l,movewindow,r
|
|
||||||
# bind = SUPERSHIFT,k,layoutmsg,swapprev
|
|
||||||
# bind = SUPERSHIFT,j,layoutmsg,swapnext
|
|
||||||
# bind = SUPERCTRL,l,splitratio,+0.05
|
|
||||||
# bind = SUPERCTRL,h,splitratio,-0.05
|
|
||||||
# bind = SUPERSHIFT,c,centerwindow
|
|
||||||
# bind = ALTCTRL,l,moveintogroup,right
|
|
||||||
# bind = ALTCTRL,h,moveintogroup,left
|
|
||||||
# bind = ALTCTRL,k,moveintogroup,up
|
|
||||||
# bind = ALTCTRL,j,moveintogroup,down
|
|
||||||
# bind = SUPERALT,g,togglegroup
|
|
||||||
|
|
||||||
# bind = SUPER,1,workspace,1
|
|
||||||
# bind = SUPER,2,workspace,2
|
|
||||||
# bind = SUPER,3,workspace,3
|
|
||||||
# bind = SUPER,4,workspace,4
|
|
||||||
# bind = SUPER,5,workspace,5
|
|
||||||
# bind = SUPER,6,workspace,6
|
|
||||||
# bind = SUPER,7,workspace,7
|
|
||||||
# bind = SUPER,8,workspace,8
|
|
||||||
# bind = SUPER,9,workspace,9
|
|
||||||
# bind = SUPER,0,workspace,10
|
|
||||||
|
|
||||||
# bind = SUPERALT,l,workspace,m+1
|
|
||||||
# bind = SUPERALT,h,workspace,m-1
|
|
||||||
|
|
||||||
# bind = SUPERSHIFT,1,movetoworkspace,1
|
|
||||||
# bind = SUPERSHIFT,2,movetoworkspace,2
|
|
||||||
# bind = SUPERSHIFT,3,movetoworkspace,3
|
|
||||||
# bind = SUPERSHIFT,4,movetoworkspace,4
|
|
||||||
# bind = SUPERSHIFT,5,movetoworkspace,5
|
|
||||||
# bind = SUPERSHIFT,6,movetoworkspace,6
|
|
||||||
# bind = SUPERSHIFT,7,movetoworkspace,7
|
|
||||||
# bind = SUPERSHIFT,8,movetoworkspace,8
|
|
||||||
# bind = SUPERSHIFT,9,movetoworkspace,9
|
|
||||||
# bind = SUPERSHIFT,0,movetoworkspace,10
|
|
||||||
|
|
||||||
# bind = SUPER,o,movewindow,mon:l
|
|
||||||
# bind = SUPER,y,togglespecialworkspace
|
|
||||||
# bind = SUPER,i,movewindow,left
|
|
||||||
# bind = SUPERSHIFT,p,pin
|
|
||||||
# bind = SUPER,n,movetoworkspace,special
|
|
||||||
# bind = SUPERALT,a,movetoworkspace,special:agenda
|
|
||||||
# bind = SUPER,g,togglespecialworkspace,agenda
|
|
||||||
|
|
||||||
# binde = , XF86AudioMute, exec, pamixer -t
|
|
||||||
# binde = , XF86AudioRaiseVolume, exec, /home/chris/bin/volup
|
|
||||||
# binde = , XF86AudioLowerVolume, exec, /home/chris/bin/voldown
|
|
||||||
# binde = ,F1, exec, pamixer -t
|
|
||||||
# binde = ,F3, exec, /home/chris/bin/volup
|
|
||||||
# binde = ,F2, exec, /home/chris/bin/voldown
|
|
||||||
# binde = , XF86MonBrightnessUp, exec, brightnessctl s +10%
|
|
||||||
# binde = , XF86MonBrightnessDown, exec, brightnessctl s 10%-
|
|
||||||
|
|
||||||
# bind=SUPERSHIFT,g,exec,waybar.sh
|
|
||||||
# bind=SUPERALT,n,exec,eww update rightside=true
|
|
||||||
|
|
||||||
# bindm=SUPER,mouse:272,movewindow
|
|
||||||
# bindm=SUPER,mouse:273,resizewindow
|
|
||||||
|
|
||||||
# # Blur waybar
|
|
||||||
# blurls=gtk-layer-shell
|
|
||||||
# # blurls=notifications
|
|
||||||
|
|
||||||
# exec-once = kwalletd5
|
|
||||||
# exec-once = swww init
|
|
||||||
# exec-once = waybar
|
|
||||||
# exec-once = dunst
|
|
||||||
# exec-once = rbw-agent
|
|
||||||
# # exec-once = /home/chris/bin/startup.sh
|
|
||||||
# exec-once = hyprctl dispatch --batch "splitratio 1; splitration -0.35"
|
|
||||||
# exec-once = dbus-update-activation-environment --systemd --all
|
|
||||||
# exec-once = jellyfin-mpv-shim
|
|
||||||
# exec-once = batmon.lisp
|
|
||||||
# exec-once = /usr/lib/kdeconnectd
|
|
||||||
# exec-once = nm-tray
|
|
||||||
# exec-once = systemctl --user restart jellyfin-mpv-shim
|
|
||||||
# exec-once = systemctl --user restart emacs
|
|
||||||
# exec-once = systemctl --user stop nextcloud-client
|
|
||||||
# exec-once = nextcloud
|
|
||||||
# exec-once = kdeconnect-indicator
|
|
||||||
# exec-once = wl-paste --watch cliphist store
|
|
||||||
# exec-once = hyprctl setcursor phinger-cursors-light 24
|
|
||||||
# exec-once = swayidle -w timeout 300 'swaylock -S --effect-blur 20x3 --fade-in 1 --effect-vignette 0.5:1 --grace 60' timeout 600 'hyprctl dispatch dpms off' resume 'hyprctl dispatch dpms on' before-sleep 'swaylock -S --effect-blur 20x3 --effect-vignette 0.5:1'
|
|
||||||
# exec-once = sleep 3 && swww img /home/chris/pics/wallpapers/nixorange.jpeg -t grow --transition-bezier .14,0,.14,.99
|
|
||||||
# '';
|
|
||||||
# };
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -65,7 +65,9 @@ with lib;
|
||||||
wofi
|
wofi
|
||||||
waybar
|
waybar
|
||||||
tridactyl-native
|
tridactyl-native
|
||||||
eww-wayland
|
eww
|
||||||
|
scc
|
||||||
|
tokei
|
||||||
wlrctl
|
wlrctl
|
||||||
wl-clipboard
|
wl-clipboard
|
||||||
hyprpaper
|
hyprpaper
|
||||||
|
|
Loading…
Reference in a new issue