all the updates
This commit is contained in:
parent
d0a9186a62
commit
6aa8643a16
12
eww/eww.yuck
12
eww/eww.yuck
|
|
@ -85,7 +85,7 @@
|
||||||
:space-evenly "false"
|
:space-evenly "false"
|
||||||
(button
|
(button
|
||||||
:class "app-button"
|
:class "app-button"
|
||||||
:onclick "hyprctl dispatch togglefloating 1" "")
|
:onclick "hyprctl dispatch togglefloating 1" "")
|
||||||
(button
|
(button
|
||||||
:class "app-button"
|
:class "app-button"
|
||||||
:onclick "hyprctl dispatch fullscreen 1" "")
|
:onclick "hyprctl dispatch fullscreen 1" "")
|
||||||
|
|
@ -171,7 +171,7 @@
|
||||||
:onclick "scripts/pop system"
|
:onclick "scripts/pop system"
|
||||||
:class "iconbat"
|
:class "iconbat"
|
||||||
:tooltip "${EWW_BATTERY["BAT1"].capacity}% battery left"
|
:tooltip "${EWW_BATTERY["BAT1"].capacity}% battery left"
|
||||||
"")
|
"")
|
||||||
(label
|
(label
|
||||||
:text "${round(EWW_BATTERY['BAT1'].capacity, 0)}%"
|
:text "${round(EWW_BATTERY['BAT1'].capacity, 0)}%"
|
||||||
:class "bat_label")))
|
:class "bat_label")))
|
||||||
|
|
@ -216,7 +216,7 @@
|
||||||
:class "iconvol"
|
:class "iconvol"
|
||||||
:onclick "scripts/pop audio"
|
:onclick "scripts/pop audio"
|
||||||
:tooltip "${volume_percent}%"
|
:tooltip "${volume_percent}%"
|
||||||
"墳")
|
"")
|
||||||
(label
|
(label
|
||||||
:text volume_percent
|
:text volume_percent
|
||||||
:class "vol_label")))
|
:class "vol_label")))
|
||||||
|
|
@ -230,7 +230,7 @@
|
||||||
:onclick "scripts/pop system"
|
:onclick "scripts/pop system"
|
||||||
:class "iconcpu"
|
:class "iconcpu"
|
||||||
:tooltip "using ${EWW_CPU.avg}% of cpu"
|
:tooltip "using ${EWW_CPU.avg}% of cpu"
|
||||||
"")
|
"")
|
||||||
(label
|
(label
|
||||||
:text "${round(EWW_CPU.avg, 0)}%"
|
:text "${round(EWW_CPU.avg, 0)}%"
|
||||||
:class "cpu_label")))
|
:class "cpu_label")))
|
||||||
|
|
@ -276,7 +276,7 @@
|
||||||
(button
|
(button
|
||||||
:onclick "if ${EWW_CMD} state | grep 'rightside: false' ; then ${EWW_CMD} update rightside=true ; else ${EWW_CMD} update rightside=false ; fi"
|
:onclick "if ${EWW_CMD} state | grep 'rightside: false' ; then ${EWW_CMD} update rightside=true ; else ${EWW_CMD} update rightside=false ; fi"
|
||||||
(label
|
(label
|
||||||
:text ""))))
|
:text ""))))
|
||||||
|
|
||||||
(defwidget nextcloud_button []
|
(defwidget nextcloud_button []
|
||||||
(box
|
(box
|
||||||
|
|
@ -286,7 +286,7 @@
|
||||||
(button
|
(button
|
||||||
:onclick "nextcloud"
|
:onclick "nextcloud"
|
||||||
(label
|
(label
|
||||||
:text ""))))
|
:text ""))))
|
||||||
|
|
||||||
(defwidget sep []
|
(defwidget sep []
|
||||||
(box
|
(box
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
#define icons for workspaces 1-9
|
#define icons for workspaces 1-9
|
||||||
ic=(0 )
|
ic=(0 )
|
||||||
|
|
||||||
#initial check for occupied workspaces
|
#initial check for occupied workspaces
|
||||||
for num in $(hyprctl workspaces | grep ID | awk '{print $3}'); do
|
for num in $(hyprctl workspaces | grep ID | awk '{print $3}'); do
|
||||||
|
|
|
||||||
395
flake.lock
395
flake.lock
|
|
@ -7,11 +7,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1683202497,
|
"lastModified": 1684227151,
|
||||||
"narHash": "sha256-ViFgWVzW/sK14DSMC6/uxnkgOFUOtjghagpvqosEo24=",
|
"narHash": "sha256-xnSgDKVhfU2o1jFCSZ+NPZTf7UJAPyskqO7uBizYPWU=",
|
||||||
"owner": "Kirottu",
|
"owner": "Kirottu",
|
||||||
"repo": "anyrun",
|
"repo": "anyrun",
|
||||||
"rev": "9f920a2108117c895f1dbda3a209eb4133cd2990",
|
"rev": "e1fb5ff99e3185292668dc675ad23d9f4a713f26",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -44,11 +44,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1682846727,
|
"lastModified": 1684405120,
|
||||||
"narHash": "sha256-efEp8ziqbj/tdd46qRpaSf7elgNJ48W3x5xLiWRDDAE=",
|
"narHash": "sha256-xuX0JLkVDl6lmnd6SZvhVeFXDtVbyEyyerp1ZDoDJQk=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "emacs-overlay",
|
"repo": "emacs-overlay",
|
||||||
"rev": "0b6c10ab19e79fd85c1bb3ea29c38eb5db464e0c",
|
"rev": "f438072ac6d2a0271a0ac5ad566d9612a9b35bb9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -120,67 +120,6 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"flake-parts": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs-lib": [
|
|
||||||
"nixified-ai",
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1677714448,
|
|
||||||
"narHash": "sha256-Hq8qLs8xFu28aDjytfxjdC96bZ6pds21Yy09mSC156I=",
|
|
||||||
"owner": "hercules-ci",
|
|
||||||
"repo": "flake-parts",
|
|
||||||
"rev": "dc531e3a9ce757041e1afaff8ee932725ca60002",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "hercules-ci",
|
|
||||||
"repo": "flake-parts",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"flake-parts_2": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs-lib": "nixpkgs-lib"
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1673362319,
|
|
||||||
"narHash": "sha256-Pjp45Vnj7S/b3BRpZEVfdu8sqqA6nvVjvYu59okhOyI=",
|
|
||||||
"owner": "hercules-ci",
|
|
||||||
"repo": "flake-parts",
|
|
||||||
"rev": "82c16f1682cf50c01cb0280b38a1eed202b3fe9f",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"id": "flake-parts",
|
|
||||||
"type": "indirect"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"flake-parts_3": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs-lib": [
|
|
||||||
"nixified-ai",
|
|
||||||
"hercules-ci-effects",
|
|
||||||
"hercules-ci-agent",
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1666885127,
|
|
||||||
"narHash": "sha256-uXA/3lhLhwOTBMn9a5zJODKqaRT+SuL5cpEmOz2ULoo=",
|
|
||||||
"owner": "hercules-ci",
|
|
||||||
"repo": "flake-parts",
|
|
||||||
"rev": "0e101dbae756d35a376a5e1faea532608e4a4b9a",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "hercules-ci",
|
|
||||||
"repo": "flake-parts",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"flake-utils": {
|
"flake-utils": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1667395993,
|
"lastModified": 1667395993,
|
||||||
|
|
@ -247,64 +186,6 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"flake-utils_5": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1667077288,
|
|
||||||
"narHash": "sha256-bdC8sFNDpT0HK74u9fUkpbf1MEzVYJ+ka7NXCdgBoaA=",
|
|
||||||
"owner": "numtide",
|
|
||||||
"repo": "flake-utils",
|
|
||||||
"rev": "6ee9ebb6b1ee695d2cacc4faa053a7b9baa76817",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "numtide",
|
|
||||||
"repo": "flake-utils",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"hercules-ci-agent": {
|
|
||||||
"inputs": {
|
|
||||||
"flake-parts": "flake-parts_3",
|
|
||||||
"nix-darwin": "nix-darwin",
|
|
||||||
"nixpkgs": "nixpkgs_5",
|
|
||||||
"pre-commit-hooks-nix": "pre-commit-hooks-nix"
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1673183923,
|
|
||||||
"narHash": "sha256-vb+AEQJAW4Xn4oHsfsx8H12XQU0aK8VYLtWYJm/ol28=",
|
|
||||||
"owner": "hercules-ci",
|
|
||||||
"repo": "hercules-ci-agent",
|
|
||||||
"rev": "b3f8aa8e4a8b22dbbe92cc5a89e6881090b933b3",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"id": "hercules-ci-agent",
|
|
||||||
"type": "indirect"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"hercules-ci-effects": {
|
|
||||||
"inputs": {
|
|
||||||
"flake-parts": "flake-parts_2",
|
|
||||||
"hercules-ci-agent": "hercules-ci-agent",
|
|
||||||
"nixpkgs": [
|
|
||||||
"nixified-ai",
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1676558019,
|
|
||||||
"narHash": "sha256-obUHCMMWbffb3k0b9YIChsJ2Z281BcDYnTPTbJRP6vs=",
|
|
||||||
"owner": "hercules-ci",
|
|
||||||
"repo": "hercules-ci-effects",
|
|
||||||
"rev": "fdbc15b55db8d037504934d3af52f788e0593380",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "hercules-ci",
|
|
||||||
"repo": "hercules-ci-effects",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"home-manager": {
|
"home-manager": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
|
|
@ -312,11 +193,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1682779989,
|
"lastModified": 1684321175,
|
||||||
"narHash": "sha256-H8AjcIBYFYrlRobYJ+n1B+ZJ6TsaaeZpuLn4iRqVvr4=",
|
"narHash": "sha256-V4EbM+jK7pvjKBaj0dgAiW9ultzDE27Nz5fRyu/ceMk=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "3144311f31194b537808ae6848f86f3dbf977d59",
|
"rev": "59659243cd4ababda605e79b4a9c2e6d83e24c86",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -334,11 +215,11 @@
|
||||||
"xdph": "xdph"
|
"xdph": "xdph"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1682976507,
|
"lastModified": 1684332077,
|
||||||
"narHash": "sha256-RC/zTlkOO1zl4vCw3iCH8G6owaf26gMAaQTOn9IEmGA=",
|
"narHash": "sha256-briamwodIZsYolceEjX41mqw/VkKiHuIEprw0u5wioY=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "Hyprland",
|
"repo": "Hyprland",
|
||||||
"rev": "c949173bc9c9f9e8276cba098cb82ed51ad4965b",
|
"rev": "79b8576df9630ea1c0fb1c6e399a424c3dcdcd47",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -368,40 +249,6 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"invokeai-src": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1677475057,
|
|
||||||
"narHash": "sha256-REtyVcyRgspn1yYvB4vIHdOrPRZRNSSraepHik9MfgE=",
|
|
||||||
"owner": "invoke-ai",
|
|
||||||
"repo": "InvokeAI",
|
|
||||||
"rev": "650f4bb58ceca458bff1410f35cd6d6caad399c6",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "invoke-ai",
|
|
||||||
"ref": "v2.3.1.post2",
|
|
||||||
"repo": "InvokeAI",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"koboldai-src": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1668957963,
|
|
||||||
"narHash": "sha256-fKQ/6LiMmrfSWczC5kcf6M9cpuF9dDYl2gJ4+6ZLSdY=",
|
|
||||||
"owner": "koboldai",
|
|
||||||
"repo": "koboldai-client",
|
|
||||||
"rev": "f2077b8e58db6bd47a62bf9ed2649bb0711f9678",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "koboldai",
|
|
||||||
"ref": "1.19.2",
|
|
||||||
"repo": "koboldai-client",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"libre-presenter": {
|
"libre-presenter": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-utils": "flake-utils_3",
|
"flake-utils": "flake-utils_3",
|
||||||
|
|
@ -409,11 +256,11 @@
|
||||||
"nixpkgs": "nixpkgs_3"
|
"nixpkgs": "nixpkgs_3"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1682719556,
|
"lastModified": 1684410130,
|
||||||
"narHash": "sha256-LIVglXCuO1B9qaV5gTO+4NbsxuzlLNtICxqlakgBjjo=",
|
"narHash": "sha256-GsP9h14SkNHVWaTAnoOpA+RtYyp7/GtC2VKV10YqtIE=",
|
||||||
"owner": "chriscochrun",
|
"owner": "chriscochrun",
|
||||||
"repo": "church-presenter",
|
"repo": "church-presenter",
|
||||||
"rev": "dd1ea7454ea6118c6051a5b9dae3d01ed858b520",
|
"rev": "7dc91ab311073256b6c0fbe7c522f52e67b236cd",
|
||||||
"type": "gitlab"
|
"type": "gitlab"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -448,11 +295,11 @@
|
||||||
"nixpkgs-unstable": "nixpkgs-unstable"
|
"nixpkgs-unstable": "nixpkgs-unstable"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1681730508,
|
"lastModified": 1683488602,
|
||||||
"narHash": "sha256-KNo59lzr9iWObEFe6vJfBEIUetNk5oloqWdJyW0g1+M=",
|
"narHash": "sha256-0zdi0Pe+B52dF7RD64PZ91BMqsyAgFqdGKgrVMq0miY=",
|
||||||
"owner": "fort-nix",
|
"owner": "fort-nix",
|
||||||
"repo": "nix-bitcoin",
|
"repo": "nix-bitcoin",
|
||||||
"rev": "7736468466bd9c50ab3065552db5293a60f651f1",
|
"rev": "30c874de014311b9c0de7860c338558a7e60dfb8",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -462,60 +309,13 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nix-darwin": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": [
|
|
||||||
"nixified-ai",
|
|
||||||
"hercules-ci-effects",
|
|
||||||
"hercules-ci-agent",
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1667419884,
|
|
||||||
"narHash": "sha256-oLNw87ZI5NxTMlNQBv1wG2N27CUzo9admaFlnmavpiY=",
|
|
||||||
"owner": "LnL7",
|
|
||||||
"repo": "nix-darwin",
|
|
||||||
"rev": "cfc0125eafadc9569d3d6a16ee928375b77e3100",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "LnL7",
|
|
||||||
"repo": "nix-darwin",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixified-ai": {
|
|
||||||
"inputs": {
|
|
||||||
"flake-parts": "flake-parts",
|
|
||||||
"hercules-ci-effects": "hercules-ci-effects",
|
|
||||||
"invokeai-src": "invokeai-src",
|
|
||||||
"koboldai-src": "koboldai-src",
|
|
||||||
"nixpkgs": [
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1681331676,
|
|
||||||
"narHash": "sha256-zOzkx39AALckaAtW175ueBOUpy/xPtrC8nnp9lHYVt0=",
|
|
||||||
"owner": "nixified-ai",
|
|
||||||
"repo": "flake",
|
|
||||||
"rev": "422bf5503375cfc5bd526862ae0b67c55f1c8705",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nixified-ai",
|
|
||||||
"repo": "flake",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixos-hardware": {
|
"nixos-hardware": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1682836095,
|
"lastModified": 1684169666,
|
||||||
"narHash": "sha256-PdzpJhuXBz71AgWNWMMYLbB8GMMce6QguhQY/6HOOcc=",
|
"narHash": "sha256-N5jrykeSxLVgvm3Dd3hZ38/XwM/jU+dltqlXgrGlYxk=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixos-hardware",
|
"repo": "nixos-hardware",
|
||||||
"rev": "e4a21ddcb45ee5f5c85a5d9e9698debf77fb98c3",
|
"rev": "71ce85372a614d418d5e303dd5702a79d1545c04",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -527,11 +327,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1682526928,
|
"lastModified": 1683014792,
|
||||||
"narHash": "sha256-2cKh4O6t1rQ8Ok+v16URynmb0rV7oZPEbXkU0owNLQs=",
|
"narHash": "sha256-6Va9iVtmmsw4raBc3QKvQT2KT/NGRWlvUlJj46zN8B8=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "d6b863fd9b7bb962e6f9fdf292419a775e772891",
|
"rev": "1a411f23ba299db155a5b45d5e145b85a7aafc42",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -556,31 +356,13 @@
|
||||||
"type": "indirect"
|
"type": "indirect"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs-lib": {
|
|
||||||
"locked": {
|
|
||||||
"dir": "lib",
|
|
||||||
"lastModified": 1672350804,
|
|
||||||
"narHash": "sha256-jo6zkiCabUBn3ObuKXHGqqORUMH27gYDIFFfLq5P4wg=",
|
|
||||||
"owner": "NixOS",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "677ed08a50931e38382dbef01cba08a8f7eac8f6",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"dir": "lib",
|
|
||||||
"owner": "NixOS",
|
|
||||||
"ref": "nixos-unstable",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs-stable": {
|
"nixpkgs-stable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1682669017,
|
"lastModified": 1684280442,
|
||||||
"narHash": "sha256-Vi+p4y3wnl0/4gcwTdmCO398kKlDaUrNROtf3GOD2NY=",
|
"narHash": "sha256-nC1/kfh6tpMQSLQalbNTNnireIlxvLLugrjZdasNh+I=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "7449971a3ecf857b4a554cf79b1d9dcc1a4647d8",
|
"rev": "6c591e7adc514090a77209f56c9d0c551ab8530d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -592,11 +374,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-unstable": {
|
"nixpkgs-unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1681571934,
|
"lastModified": 1683353485,
|
||||||
"narHash": "sha256-Q3B3HTqhTahhPCT53ahK1FPktOXlEWmudSttd9CWGbE=",
|
"narHash": "sha256-Skp5El3egmoXPiINWjnoW0ktVfB7PR/xc4F4bhD+BJY=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "29176972b4be60f7d3eb3101f696c99f2e6ada57",
|
"rev": "caf436a52b25164b71e0d48b671127ac2e2a5b75",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -608,11 +390,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1682566018,
|
"lastModified": 1682779028,
|
||||||
"narHash": "sha256-HPzPRFiy2o/7k7mtnwfM1E6NVZHiFbPdmYCMoIpkHO4=",
|
"narHash": "sha256-tFfSbwSLobpHRznAa35KEU3R+fsFWTlmpFhTUdXq8RE=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "8e3b64db39f2aaa14b35ee5376bd6a2e707cadc2",
|
"rev": "54abe781c482f51ff4ff534ebaba77db5bd97442",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -621,54 +403,6 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_3": {
|
"nixpkgs_3": {
|
||||||
"locked": {
|
|
||||||
"lastModified": 1682526928,
|
|
||||||
"narHash": "sha256-2cKh4O6t1rQ8Ok+v16URynmb0rV7oZPEbXkU0owNLQs=",
|
|
||||||
"owner": "nixos",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "d6b863fd9b7bb962e6f9fdf292419a775e772891",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nixos",
|
|
||||||
"ref": "nixos-unstable",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs_4": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1681482634,
|
|
||||||
"narHash": "sha256-cT/nr3L8khEYZSGp8qqwxFH+/q4/547MfyOdSj6MhBk=",
|
|
||||||
"owner": "NixOS",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "fda0d99c2cbbb5c89d8855d258cb0821bd9113ad",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "NixOS",
|
|
||||||
"ref": "nixos-22.11",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs_5": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1672262501,
|
|
||||||
"narHash": "sha256-ZNXqX9lwYo1tOFAqrVtKTLcJ2QMKCr3WuIvpN8emp7I=",
|
|
||||||
"owner": "NixOS",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "e182da8622a354d44c39b3d7a542dc12cd7baa5f",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "NixOS",
|
|
||||||
"ref": "nixos-unstable",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs_6": {
|
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1682692304,
|
"lastModified": 1682692304,
|
||||||
"narHash": "sha256-9/lyXN2BpHw+1xE+D2ySBSLMCHWqiWu5tPHBMRDib8M=",
|
"narHash": "sha256-9/lyXN2BpHw+1xE+D2ySBSLMCHWqiWu5tPHBMRDib8M=",
|
||||||
|
|
@ -684,7 +418,39 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_7": {
|
"nixpkgs_4": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1683207485,
|
||||||
|
"narHash": "sha256-gs+PHt/y/XQB7S8+YyBLAM8LjgYpPZUVFQBwpFSmJro=",
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "cc45a3f8c98e1c33ca996e3504adefbf660a72d1",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "NixOS",
|
||||||
|
"ref": "nixos-22.11",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nixpkgs_5": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1684385584,
|
||||||
|
"narHash": "sha256-O7y0gK8OLIDqz+LaHJJyeu09IGiXlZIS3+JgEzGmmJA=",
|
||||||
|
"owner": "nixos",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "48a0fb7aab511df92a17cf239c37f2bd2ec9ae3a",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nixos",
|
||||||
|
"ref": "nixos-unstable",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nixpkgs_6": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1669542132,
|
"lastModified": 1669542132,
|
||||||
"narHash": "sha256-DRlg++NJAwPh8io3ExBJdNW7Djs3plVI5jgYQ+iXAZQ=",
|
"narHash": "sha256-DRlg++NJAwPh8io3ExBJdNW7Djs3plVI5jgYQ+iXAZQ=",
|
||||||
|
|
@ -699,30 +465,6 @@
|
||||||
"type": "indirect"
|
"type": "indirect"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"pre-commit-hooks-nix": {
|
|
||||||
"inputs": {
|
|
||||||
"flake-utils": "flake-utils_5",
|
|
||||||
"nixpkgs": [
|
|
||||||
"nixified-ai",
|
|
||||||
"hercules-ci-effects",
|
|
||||||
"hercules-ci-agent",
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1667760143,
|
|
||||||
"narHash": "sha256-+X5CyeNEKp41bY/I1AJgW/fn69q5cLJ1bgiaMMCKB3M=",
|
|
||||||
"owner": "cachix",
|
|
||||||
"repo": "pre-commit-hooks.nix",
|
|
||||||
"rev": "06f48d63d473516ce5b8abe70d15be96a0147fcd",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "cachix",
|
|
||||||
"repo": "pre-commit-hooks.nix",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"root": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"anyrun": "anyrun",
|
"anyrun": "anyrun",
|
||||||
|
|
@ -732,9 +474,8 @@
|
||||||
"hyprland": "hyprland",
|
"hyprland": "hyprland",
|
||||||
"libre-presenter": "libre-presenter",
|
"libre-presenter": "libre-presenter",
|
||||||
"nix-bitcoin": "nix-bitcoin",
|
"nix-bitcoin": "nix-bitcoin",
|
||||||
"nixified-ai": "nixified-ai",
|
|
||||||
"nixos-hardware": "nixos-hardware",
|
"nixos-hardware": "nixos-hardware",
|
||||||
"nixpkgs": "nixpkgs_6",
|
"nixpkgs": "nixpkgs_5",
|
||||||
"nixpkgs-stable": "nixpkgs-stable",
|
"nixpkgs-stable": "nixpkgs-stable",
|
||||||
"simple-nixos-mailserver": "simple-nixos-mailserver"
|
"simple-nixos-mailserver": "simple-nixos-mailserver"
|
||||||
}
|
}
|
||||||
|
|
@ -764,7 +505,7 @@
|
||||||
"simple-nixos-mailserver": {
|
"simple-nixos-mailserver": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"blobs": "blobs",
|
"blobs": "blobs",
|
||||||
"nixpkgs": "nixpkgs_7",
|
"nixpkgs": "nixpkgs_6",
|
||||||
"nixpkgs-22_11": "nixpkgs-22_11",
|
"nixpkgs-22_11": "nixpkgs-22_11",
|
||||||
"utils": "utils"
|
"utils": "utils"
|
||||||
},
|
},
|
||||||
|
|
|
||||||
60
flake.nix
60
flake.nix
|
|
@ -33,13 +33,13 @@
|
||||||
libre-presenter = {
|
libre-presenter = {
|
||||||
url = "gitlab:chriscochrun/church-presenter";
|
url = "gitlab:chriscochrun/church-presenter";
|
||||||
};
|
};
|
||||||
nixified-ai = {
|
# nixified-ai = {
|
||||||
url = "github:nixified-ai/flake";
|
# url = "github:nixified-ai/flake";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
# inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
# };
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = { nixpkgs, nixpkgs-stable, home-manager, hyprland, nixos-hardware, emacs, nix-bitcoin, libre-presenter, nixified-ai, anyrun, ... }:
|
outputs = { nixpkgs, nixpkgs-stable, home-manager, hyprland, nixos-hardware, emacs, nix-bitcoin, libre-presenter, anyrun, ... }:
|
||||||
let
|
let
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
username = "chris";
|
username = "chris";
|
||||||
|
|
@ -48,7 +48,7 @@
|
||||||
config = { allowUnfree = true; };
|
config = { allowUnfree = true; };
|
||||||
overlays = [
|
overlays = [
|
||||||
emacs.overlays.default
|
emacs.overlays.default
|
||||||
anyrun.overlay
|
# anyrun.overlay
|
||||||
# (self: super: {
|
# (self: super: {
|
||||||
# ffmpeg_5-full = super.ffmpeg_5-full.overrideAttrs (old: {
|
# ffmpeg_5-full = super.ffmpeg_5-full.overrideAttrs (old: {
|
||||||
# postFixup = ''
|
# postFixup = ''
|
||||||
|
|
@ -57,31 +57,31 @@
|
||||||
# '';
|
# '';
|
||||||
# });
|
# });
|
||||||
# })
|
# })
|
||||||
(self: super:
|
# (self: super:
|
||||||
{
|
# {
|
||||||
awesome = super.awesome.overrideAttrs (old: rec {
|
# awesome = super.awesome.overrideAttrs (old: rec {
|
||||||
pname = "awesome";
|
# pname = "awesome";
|
||||||
version = "git-20220614-3a54221";
|
# version = "git-20220614-3a54221";
|
||||||
src = super.fetchFromGitHub {
|
# src = super.fetchFromGitHub {
|
||||||
owner = "awesomeWM";
|
# owner = "awesomeWM";
|
||||||
repo = "awesome";
|
# repo = "awesome";
|
||||||
rev = "3a542219f3bf129546ae79eb20e384ea28fa9798";
|
# rev = "3a542219f3bf129546ae79eb20e384ea28fa9798";
|
||||||
sha256 = "4z3w6iuv+Gw2xRvhv2AX4suO6dl82woJn0p1nkEx3uM=";
|
# sha256 = "4z3w6iuv+Gw2xRvhv2AX4suO6dl82woJn0p1nkEx3uM=";
|
||||||
};
|
# };
|
||||||
patches = [];
|
# patches = [];
|
||||||
});
|
# });
|
||||||
}
|
# }
|
||||||
)
|
# )
|
||||||
|
|
||||||
(self: super:
|
# (self: super:
|
||||||
{
|
# {
|
||||||
qt5ct = super.qt5ct.overrideAttrs (old: rec {
|
# qt5ct = super.qt5ct.overrideAttrs (old: rec {
|
||||||
patches = (old.patches or []) ++ [
|
# patches = (old.patches or []) ++ [
|
||||||
../../qt5ct.patch
|
# ../../qt5ct.patch
|
||||||
];
|
# ];
|
||||||
});
|
# });
|
||||||
}
|
# }
|
||||||
)
|
# )
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -52,7 +52,7 @@ with lib;
|
||||||
libsForQt5.bismuth
|
libsForQt5.bismuth
|
||||||
libnotify
|
libnotify
|
||||||
rofi-wayland
|
rofi-wayland
|
||||||
anyrun
|
#anyrun
|
||||||
wf-recorder
|
wf-recorder
|
||||||
wofi
|
wofi
|
||||||
waybar
|
waybar
|
||||||
|
|
|
||||||
|
|
@ -317,53 +317,53 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
services.espanso = {
|
#services.espanso = {
|
||||||
enable = true;
|
# enable = true;
|
||||||
settings = {
|
# settings = {
|
||||||
toggle_key = "RIGHT_CTRL";
|
# toggle_key = "RIGHT_CTRL";
|
||||||
matches = [
|
# matches = [
|
||||||
{ # dates
|
# { # dates
|
||||||
trigger = ":date";
|
# trigger = ":date";
|
||||||
replace = "{{mydate}}";
|
# replace = "{{mydate}}";
|
||||||
vars = [{
|
# vars = [{
|
||||||
|
|
||||||
name = "mydate";
|
# name = "mydate";
|
||||||
type = "date";
|
# type = "date";
|
||||||
params = {format = "%m/%d/%Y";};
|
# params = {format = "%m/%d/%Y";};
|
||||||
}];
|
# }];
|
||||||
}
|
# }
|
||||||
{ # Shell commands
|
# { # Shell commands
|
||||||
trigger = ":shell";
|
# trigger = ":shell";
|
||||||
replace = "{{output}}";
|
# replace = "{{output}}";
|
||||||
vars = [{
|
# vars = [{
|
||||||
name = "output";
|
# name = "output";
|
||||||
type = "shell";
|
# type = "shell";
|
||||||
params = { cmd = "echo Hello from your shell";};
|
# params = { cmd = "echo Hello from your shell";};
|
||||||
}];
|
# }];
|
||||||
}
|
# }
|
||||||
{ # simple text
|
# { # simple text
|
||||||
trigger = ":gml";
|
# trigger = ":gml";
|
||||||
replace = "ccochrun21@gmail.com";
|
# replace = "ccochrun21@gmail.com";
|
||||||
}
|
# }
|
||||||
{
|
# {
|
||||||
trigger = ":otl";
|
# trigger = ":otl";
|
||||||
replace = "chris.cochrun@outlook.com";
|
# replace = "chris.cochrun@outlook.com";
|
||||||
}
|
# }
|
||||||
{
|
# {
|
||||||
trigger = ":tfcml";
|
# trigger = ":tfcml";
|
||||||
replace = "chris@tfcconnection.org";
|
# replace = "chris@tfcconnection.org";
|
||||||
}
|
# }
|
||||||
{
|
# {
|
||||||
trigger = ":name";
|
# trigger = ":name";
|
||||||
replace = "Chris Cochrun";
|
# replace = "Chris Cochrun";
|
||||||
}
|
# }
|
||||||
{
|
# {
|
||||||
trigger = ":cn";
|
# trigger = ":cn";
|
||||||
replace = "A Giant Gummy Lizard";
|
# replace = "A Giant Gummy Lizard";
|
||||||
}
|
# }
|
||||||
];
|
# ];
|
||||||
};
|
# };
|
||||||
};
|
#};
|
||||||
|
|
||||||
home.file.".config/rofi" = {
|
home.file.".config/rofi" = {
|
||||||
source = ../rofi;
|
source = ../rofi;
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue