a lot of changes...
This commit is contained in:
parent
d320410242
commit
bca3a99f9d
|
|
@ -180,7 +180,7 @@ function Bar(monitor = 0) {
|
||||||
App.config({
|
App.config({
|
||||||
style: css,
|
style: css,
|
||||||
windows: [
|
windows: [
|
||||||
Bar(laptop ? 0 : 1), // can be instantiated for each monitor
|
Bar(laptop ? 0 : 0), // can be instantiated for each monitor
|
||||||
NotificationPopups(),
|
NotificationPopups(),
|
||||||
(laptop ? BatteryPopup() : null)
|
(laptop ? BatteryPopup() : null)
|
||||||
],
|
],
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@ set update.nagwait 7
|
||||||
set update.lastnaggedversion 1.14.0
|
set update.lastnaggedversion 1.14.0
|
||||||
set update.checkintervalsecs 86400
|
set update.checkintervalsecs 86400
|
||||||
set searchurls.gh https://github.com/search?utf8=✓&q=
|
set searchurls.gh https://github.com/search?utf8=✓&q=
|
||||||
set searchurls.y https://www.yewtu.be/search?q=
|
set searchurls.y https://www.inv.cochrun.xyz/search?q=
|
||||||
set searchurls.aw https://wiki.archlinux.org/index.php?search=
|
set searchurls.aw https://wiki.archlinux.org/index.php?search=
|
||||||
set searchurls.qt https://doc.qt.io/qt-5/search-results.html?q=
|
set searchurls.qt https://doc.qt.io/qt-5/search-results.html?q=
|
||||||
set searchurls.mel https://melpa.org/#/?q=
|
set searchurls.mel https://melpa.org/#/?q=
|
||||||
|
|
@ -17,7 +17,7 @@ set searchurls.wiki https://en.wikipedia.org/wiki/Special:Search/
|
||||||
set searchurls.g https://www.google.com/search?q=
|
set searchurls.g https://www.google.com/search?q=
|
||||||
set searchurls.d https://duckduckgo.com/?q=
|
set searchurls.d https://duckduckgo.com/?q=
|
||||||
set searchurls.s https://search.tfcconnection.org/?q=
|
set searchurls.s https://search.tfcconnection.org/?q=
|
||||||
set searchurls.ama https://smile.amazon.com/s/ref=nb_sb_noss?url=search-alias%3Daps&field-keywords=
|
set searchurls.ama https://amazon.com/s/ref=nb_sb_noss?url=search-alias%3Daps&field-keywords=
|
||||||
set searchurls.google https://www.google.com/search?q=
|
set searchurls.google https://www.google.com/search?q=
|
||||||
set searchurls.googlelucky https://www.google.com/search?btnI=I'm+Feeling+Lucky&q=
|
set searchurls.googlelucky https://www.google.com/search?btnI=I'm+Feeling+Lucky&q=
|
||||||
set searchurls.scholar https://scholar.google.com/scholar?q=
|
set searchurls.scholar https://scholar.google.com/scholar?q=
|
||||||
|
|
|
||||||
156
flake.lock
156
flake.lock
|
|
@ -20,14 +20,15 @@
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
]
|
],
|
||||||
|
"systems": "systems"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1718921313,
|
"lastModified": 1721306136,
|
||||||
"narHash": "sha256-TFJah1RW5qnYW7kajjAFPAS5j/0q0R3vz9zPjrRA0Mc=",
|
"narHash": "sha256-VKPsIGf3/a+RONBipx4lEE4LXG2sdMNkWQu22LNQItg=",
|
||||||
"owner": "Aylur",
|
"owner": "Aylur",
|
||||||
"repo": "ags",
|
"repo": "ags",
|
||||||
"rev": "646d5ad073ff7f8b1d50cfbd40f5b8a250fcd59d",
|
"rev": "344ea72cd3b8d4911f362fec34bce7d8fb37028c",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -89,11 +90,11 @@
|
||||||
"base16-helix": {
|
"base16-helix": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1696727917,
|
"lastModified": 1720809814,
|
||||||
"narHash": "sha256-FVrbPk+NtMra0jtlC5oxyNchbm8FosmvXIatkRbYy1g=",
|
"narHash": "sha256-numb3xigRGnr/deF7wdjBwVg7fpbTH7reFDkJ75AJkY=",
|
||||||
"owner": "tinted-theming",
|
"owner": "tinted-theming",
|
||||||
"repo": "base16-helix",
|
"repo": "base16-helix",
|
||||||
"rev": "dbe1480d99fe80f08df7970e471fac24c05f2ddb",
|
"rev": "34f41987bec14c0f3f6b2155c19787b1f6489625",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -196,11 +197,11 @@
|
||||||
"nixpkgs-stable": "nixpkgs-stable"
|
"nixpkgs-stable": "nixpkgs-stable"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1713171039,
|
"lastModified": 1724119075,
|
||||||
"narHash": "sha256-9QrWi1VqMafXPAWw126uWRn56MtwzokNxDevSTjeQ/U=",
|
"narHash": "sha256-rZe4WgHhLqhu4NjGVYyIQ36ieHZgSkfnNMdLzKaqFQk=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "emacs-overlay",
|
"repo": "emacs-overlay",
|
||||||
"rev": "612646835968f663fd0e8f1a21ef52b5d0b88c57",
|
"rev": "e197771f35c8c330324256c5f306614f273ffd9d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -218,11 +219,11 @@
|
||||||
"rust-overlay": "rust-overlay"
|
"rust-overlay": "rust-overlay"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1713106678,
|
"lastModified": 1720177068,
|
||||||
"narHash": "sha256-dm4bufwlVDUE4ndsR6cAPur75hvlVRzIxbMKJCizutg=",
|
"narHash": "sha256-LTSFlW/46hl1u9SzqnvbtNxswCW05bhwOY6CzVEJC5o=",
|
||||||
"owner": "elkowar",
|
"owner": "elkowar",
|
||||||
"repo": "eww",
|
"repo": "eww",
|
||||||
"rev": "1e37f53e99016aa2cd725d7050788bb5d4fcc76a",
|
"rev": "4d55e9ad63d1fae887726dffcd25a32def23d34f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -243,11 +244,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1699821751,
|
"lastModified": 1722175938,
|
||||||
"narHash": "sha256-UlId5jvJFmkVcKpn0oZ2VTvWAc/mZy6butRZGk73xXM=",
|
"narHash": "sha256-HKyB4HD+NdX3T233bY31hm76v3/tdQBNeLLvopKbZeY=",
|
||||||
"owner": "erikarvstedt",
|
"owner": "erikarvstedt",
|
||||||
"repo": "extra-container",
|
"repo": "extra-container",
|
||||||
"rev": "842912907bf189ef17a80ca09ba37b6bdfc76c49",
|
"rev": "37e7207ac9f857eedb58b208b9dc91cd6b24e651",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -304,7 +305,7 @@
|
||||||
},
|
},
|
||||||
"flake-utils": {
|
"flake-utils": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"systems": "systems"
|
"systems": "systems_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1710146030,
|
"lastModified": 1710146030,
|
||||||
|
|
@ -322,7 +323,7 @@
|
||||||
},
|
},
|
||||||
"flake-utils_2": {
|
"flake-utils_2": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"systems": "systems_2"
|
"systems": "systems_3"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1705309234,
|
"lastModified": 1705309234,
|
||||||
|
|
@ -340,7 +341,7 @@
|
||||||
},
|
},
|
||||||
"flake-utils_3": {
|
"flake-utils_3": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"systems": "systems_3"
|
"systems": "systems_4"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1710146030,
|
"lastModified": 1710146030,
|
||||||
|
|
@ -358,7 +359,7 @@
|
||||||
},
|
},
|
||||||
"flake-utils_4": {
|
"flake-utils_4": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"systems": "systems_4"
|
"systems": "systems_5"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1710146030,
|
"lastModified": 1710146030,
|
||||||
|
|
@ -376,7 +377,7 @@
|
||||||
},
|
},
|
||||||
"flake-utils_5": {
|
"flake-utils_5": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"systems": "systems_5"
|
"systems": "systems_6"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1710146030,
|
"lastModified": 1710146030,
|
||||||
|
|
@ -392,24 +393,6 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"flake-utils_6": {
|
|
||||||
"inputs": {
|
|
||||||
"systems": "systems_6"
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1705309234,
|
|
||||||
"narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
|
|
||||||
"owner": "numtide",
|
|
||||||
"repo": "flake-utils",
|
|
||||||
"rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "numtide",
|
|
||||||
"repo": "flake-utils",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"fromYaml": {
|
"fromYaml": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
|
|
@ -450,11 +433,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1713166971,
|
"lastModified": 1723986931,
|
||||||
"narHash": "sha256-t0P/rKlsE5l1O3O2LYtAelLzp7PeoPCSzsIietQ1hSM=",
|
"narHash": "sha256-Fy+KEvDQ+Hc8lJAV3t6leXhZJ2ncU5/esxkgt3b8DEY=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "1c43dcfac48a2d622797f7ab741670fdbcf8f609",
|
"rev": "2598861031b78aadb4da7269df7ca9ddfc3e1671",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -492,11 +475,11 @@
|
||||||
"nixpkgs": "nixpkgs_2"
|
"nixpkgs": "nixpkgs_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1713109956,
|
"lastModified": 1721242107,
|
||||||
"narHash": "sha256-JMJBqWnuM3JWkoYnou/OW46FSt9UX/LpXARJTYAG6jA=",
|
"narHash": "sha256-HZAEP6wfXYInAlb7oCoN9Mjoqyok08JySnLPaWR9DQU=",
|
||||||
"owner": "chriscochrun",
|
"owner": "chriscochrun",
|
||||||
"repo": "lumina",
|
"repo": "lumina",
|
||||||
"rev": "a00f1b081a3907c664074f4164bde9c604c48c92",
|
"rev": "bf9f65fade0b6bd6189e9afec15b706d9253e002",
|
||||||
"type": "gitlab"
|
"type": "gitlab"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -531,11 +514,11 @@
|
||||||
"nixpkgs-unstable": "nixpkgs-unstable"
|
"nixpkgs-unstable": "nixpkgs-unstable"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1712227415,
|
"lastModified": 1723533469,
|
||||||
"narHash": "sha256-4EvWs6rHxCIj9FFXI4Vxh32XJaZJfIqKtAal6vJfqAs=",
|
"narHash": "sha256-8gSsZpYmOzwFRaLIX0OMBvV/+SATmu/O9QXkDgsZlIg=",
|
||||||
"owner": "fort-nix",
|
"owner": "fort-nix",
|
||||||
"repo": "nix-bitcoin",
|
"repo": "nix-bitcoin",
|
||||||
"rev": "1a3748a368e96e3f3a38735bd9417f634beeeace",
|
"rev": "6e208d6a7b554be592167f6ecad9b16c0abf96d7",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -547,11 +530,11 @@
|
||||||
},
|
},
|
||||||
"nixos-hardware": {
|
"nixos-hardware": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1712909959,
|
"lastModified": 1724067415,
|
||||||
"narHash": "sha256-7/5ubuwdEbQ7Z+Vqd4u0mM5L2VMNDsBh54visp27CtQ=",
|
"narHash": "sha256-WJBAEFXAtA41RMpK8mvw0cQ62CJkNMBtzcEeNIJV7b0=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixos-hardware",
|
"repo": "nixos-hardware",
|
||||||
"rev": "f58b25254be441cd2a9b4b444ed83f1e51244f1f",
|
"rev": "b09c46430ffcf18d575acf5c339b38ac4e1db5d2",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -590,27 +573,27 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-stable": {
|
"nixpkgs-stable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1713013257,
|
"lastModified": 1723938990,
|
||||||
"narHash": "sha256-ZEfGB3YCBVggvk0BQIqVY7J8XF/9jxQ68fCca6nib+8=",
|
"narHash": "sha256-9tUadhnZQbWIiYVXH8ncfGXGvkNq3Hag4RCBEMUk7MI=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "90055d5e616bd943795d38808c94dbf0dd35abe8",
|
"rev": "c42fcfbdfeae23e68fc520f9182dde9f38ad1890",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"ref": "nixos-23.11",
|
"ref": "nixos-24.05",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs-stable_2": {
|
"nixpkgs-stable_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1713013257,
|
"lastModified": 1720535198,
|
||||||
"narHash": "sha256-ZEfGB3YCBVggvk0BQIqVY7J8XF/9jxQ68fCca6nib+8=",
|
"narHash": "sha256-zwVvxrdIzralnSbcpghA92tWu2DV2lwv89xZc8MTrbg=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "90055d5e616bd943795d38808c94dbf0dd35abe8",
|
"rev": "205fd4226592cc83fd4c0885a3e4c9c400efabb5",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -622,11 +605,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-unstable": {
|
"nixpkgs-unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1712026416,
|
"lastModified": 1723221148,
|
||||||
"narHash": "sha256-N/3VR/9e1NlN49p7kCiATiEY6Tzdo+CbrAG8kqCQKcI=",
|
"narHash": "sha256-7pjpeQlZUNQ4eeVntytU3jkw9dFK3k1Htgk2iuXjaD8=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "080a4a27f206d07724b88da096e27ef63401a504",
|
"rev": "154bcb95ad51bc257c2ce4043a725de6ca700ef6",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -654,27 +637,27 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_3": {
|
"nixpkgs_3": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1711668574,
|
"lastModified": 1723282977,
|
||||||
"narHash": "sha256-u1dfs0ASQIEr1icTVrsKwg2xToIpn7ZXxW3RHfHxshg=",
|
"narHash": "sha256-oTK91aOlA/4IsjNAZGMEBz7Sq1zBS0Ltu4/nIQdYDOg=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "219951b495fc2eac67b1456824cc1ec1fd2ee659",
|
"rev": "a781ff33ae258bbcfd4ed6e673860c3e923bf2cc",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"ref": "nixos-23.11",
|
"ref": "nixos-24.05",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_4": {
|
"nixpkgs_4": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1712963716,
|
"lastModified": 1723991338,
|
||||||
"narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=",
|
"narHash": "sha256-Grh5PF0+gootJfOJFenTTxDTYPidA3V28dqJ/WV7iis=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "cfd6b5fc90b15709b780a5a1619695a88505a176",
|
"rev": "8a3354191c0d7144db9756a74755672387b702ba",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -742,11 +725,11 @@
|
||||||
"rust-overlay": "rust-overlay_2"
|
"rust-overlay": "rust-overlay_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1720526170,
|
"lastModified": 1724168344,
|
||||||
"narHash": "sha256-i+42syggxAdDLo9MCs+Cx3BSil8RTW3VGfLkR5gbD8E=",
|
"narHash": "sha256-JqBcwOOeiXFtVGKFrutTVALleh/3wbzgIZzSh3k67bk=",
|
||||||
"ref": "refs/heads/master",
|
"ref": "refs/heads/master",
|
||||||
"rev": "54551b117435a006acddefbf3850b02d6ee84ffa",
|
"rev": "8922388caa8ad879bdc2b82267bb5122afb77a1e",
|
||||||
"revCount": 2040,
|
"revCount": 2083,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://seed.radicle.garden/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git"
|
"url": "https://seed.radicle.garden/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git"
|
||||||
},
|
},
|
||||||
|
|
@ -782,11 +765,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1708395022,
|
"lastModified": 1708999822,
|
||||||
"narHash": "sha256-pxHZbfDsLAAcyWz+snbudxhQPlAnK2nWGAqRx11veac=",
|
"narHash": "sha256-X55GxqI3oDEfqy38Pt7xyypYNly4bkd/RajFE+FGn+A=",
|
||||||
"owner": "oxalica",
|
"owner": "oxalica",
|
||||||
"repo": "rust-overlay",
|
"repo": "rust-overlay",
|
||||||
"rev": "b4ae18c03af976549a0b6e396b2b5be56d275f8b",
|
"rev": "1a618c62479a6896ac497aaa0d969c6bd8e24911",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -822,17 +805,16 @@
|
||||||
},
|
},
|
||||||
"rust-overlay_3": {
|
"rust-overlay_3": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-utils": "flake-utils_6",
|
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1713150335,
|
"lastModified": 1724120436,
|
||||||
"narHash": "sha256-Ic7zCPfiSYc9nFFp+E44WFk3TBJ99J/uPZ4QXX+uPPw=",
|
"narHash": "sha256-/MvfxTjco5UDBF6SEvwyeXrXwZG7nz7/mDVreQNKsWg=",
|
||||||
"owner": "oxalica",
|
"owner": "oxalica",
|
||||||
"repo": "rust-overlay",
|
"repo": "rust-overlay",
|
||||||
"rev": "b186d85e747e2b7bee220ec95839fb66c868dc47",
|
"rev": "48e61fe824f5823e4f3f15dd9a75c19c63649269",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -880,11 +862,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1719152448,
|
"lastModified": 1724091143,
|
||||||
"narHash": "sha256-Acbi1Crd+UEbpPW8IR0ZGRKV+JCnMXDS2cglFQJvRPM=",
|
"narHash": "sha256-55CrA0BNqmnS4qB812D7JY9hNBB0r36sJlErepkfeTo=",
|
||||||
"owner": "danth",
|
"owner": "danth",
|
||||||
"repo": "stylix",
|
"repo": "stylix",
|
||||||
"rev": "0fc4e9f1449a9dce4be7a1ecedd97949da591181",
|
"rev": "94d70292d0c687ebacb65d00bd516cbefa18d3ca",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -895,16 +877,16 @@
|
||||||
},
|
},
|
||||||
"systems": {
|
"systems": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1681028828,
|
"lastModified": 1689347949,
|
||||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
|
||||||
"owner": "nix-systems",
|
"owner": "nix-systems",
|
||||||
"repo": "default",
|
"repo": "default-linux",
|
||||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
"rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nix-systems",
|
"owner": "nix-systems",
|
||||||
"repo": "default",
|
"repo": "default-linux",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -87,6 +87,7 @@
|
||||||
inherit system;
|
inherit system;
|
||||||
config = { allowUnfree = true; };
|
config = { allowUnfree = true; };
|
||||||
};
|
};
|
||||||
|
|
||||||
pkgsForSystem = import nixpkgs {
|
pkgsForSystem = import nixpkgs {
|
||||||
inherit system;
|
inherit system;
|
||||||
config = { allowUnfree = true; };
|
config = { allowUnfree = true; };
|
||||||
|
|
@ -136,6 +137,7 @@
|
||||||
kaladin = lib.nixosSystem {
|
kaladin = lib.nixosSystem {
|
||||||
inherit system;
|
inherit system;
|
||||||
pkgs = pkgsForSystem;
|
pkgs = pkgsForSystem;
|
||||||
|
|
||||||
modules = [
|
modules = [
|
||||||
./systems/kaladin/configuration.nix
|
./systems/kaladin/configuration.nix
|
||||||
home-manager.nixosModules.home-manager
|
home-manager.nixosModules.home-manager
|
||||||
|
|
|
||||||
|
|
@ -84,6 +84,8 @@ in
|
||||||
"audio/flac" = "mpv-slow.desktop";
|
"audio/flac" = "mpv-slow.desktop";
|
||||||
"audio/wav" = "mpv-slow.desktop";
|
"audio/wav" = "mpv-slow.desktop";
|
||||||
"audio/opus" = "mpv-slow.desktop";
|
"audio/opus" = "mpv-slow.desktop";
|
||||||
|
"audio/x-opus" = "mpv-slow.desktop";
|
||||||
|
"audio/x-opus+ogg" = "mpv-slow.desktop";
|
||||||
};
|
};
|
||||||
defaultApplications = {
|
defaultApplications = {
|
||||||
"video/mp4" = "mpv.desktop";
|
"video/mp4" = "mpv.desktop";
|
||||||
|
|
|
||||||
|
|
@ -81,7 +81,7 @@ in
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
home.file.".config/hypr/hyprpaper.conf" = {
|
home.file.".config/hypr/hyprpaper.conf" = {
|
||||||
source = if laptop then /home/chris/.dotfiles/.config/hypr/hyprpaper.conf else /home/chris/.dotfiles/.config/hypr/hyprpaper.conf;
|
source = ../../.config/hypr/hyprpaper.conf;
|
||||||
};
|
};
|
||||||
|
|
||||||
wayland.windowManager.hyprland = {
|
wayland.windowManager.hyprland = {
|
||||||
|
|
@ -132,7 +132,7 @@ in
|
||||||
|
|
||||||
#damage_tracking=full # leave it on full unless you hate your GPU and want to make it suffer
|
#damage_tracking=full # leave it on full unless you hate your GPU and want to make it suffer
|
||||||
layout = "master";
|
layout = "master";
|
||||||
no_cursor_warps = false;
|
# no_cursor_warps = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
gestures = {
|
gestures = {
|
||||||
|
|
@ -186,7 +186,7 @@ in
|
||||||
master = {
|
master = {
|
||||||
special_scale_factor = 0.8;
|
special_scale_factor = 0.8;
|
||||||
mfact = 0.65;
|
mfact = 0.65;
|
||||||
new_is_master = false;
|
# new_is_master = false;
|
||||||
new_on_top = false;
|
new_on_top = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -252,8 +252,8 @@ in
|
||||||
"SUPER,j,layoutmsg,cyclenext"
|
"SUPER,j,layoutmsg,cyclenext"
|
||||||
"SUPERSHIFT,h,movewindow,l"
|
"SUPERSHIFT,h,movewindow,l"
|
||||||
"SUPERSHIFT,l,movewindow,r"
|
"SUPERSHIFT,l,movewindow,r"
|
||||||
"SUPERSHIFTALT,h,layoutmsg,addmaster"
|
"SUPERALT,j,layoutmsg,orientationnext"
|
||||||
"SUPERSHIFTALT,l,layoutmsg,addmaster"
|
"SUPERALT,k,layoutmsg,orientationprev"
|
||||||
"SUPERSHIFT,k,layoutmsg,swapprev"
|
"SUPERSHIFT,k,layoutmsg,swapprev"
|
||||||
"SUPERSHIFT,j,layoutmsg,swapnext"
|
"SUPERSHIFT,j,layoutmsg,swapnext"
|
||||||
"SUPERCTRL,l,splitratio,+0.05"
|
"SUPERCTRL,l,splitratio,+0.05"
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
with lib;
|
with lib;
|
||||||
{
|
{
|
||||||
hardware.opengl = {
|
hardware.opengl = {
|
||||||
driSupport = true;
|
# driSupport = true;
|
||||||
driSupport32Bit = true;
|
driSupport32Bit = true;
|
||||||
};
|
};
|
||||||
programs.steam = {
|
programs.steam = {
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,7 @@
|
||||||
guile-json
|
guile-json
|
||||||
guile-lib
|
guile-lib
|
||||||
scsh
|
scsh
|
||||||
radicle-cli
|
radicle-node
|
||||||
# unrar
|
# unrar
|
||||||
p7zip
|
p7zip
|
||||||
zip
|
zip
|
||||||
|
|
@ -41,7 +41,7 @@
|
||||||
ripgrep
|
ripgrep
|
||||||
fd
|
fd
|
||||||
socat
|
socat
|
||||||
ffmpeg_5-full
|
ffmpeg-full
|
||||||
imagemagick
|
imagemagick
|
||||||
libheif
|
libheif
|
||||||
trash-cli
|
trash-cli
|
||||||
|
|
@ -54,7 +54,7 @@
|
||||||
samba
|
samba
|
||||||
blesh
|
blesh
|
||||||
# OVMFFull
|
# OVMFFull
|
||||||
quickemu
|
# quickemu
|
||||||
macchina
|
macchina
|
||||||
neofetch
|
neofetch
|
||||||
fwupd
|
fwupd
|
||||||
|
|
|
||||||
|
|
@ -19,7 +19,7 @@ with lib;
|
||||||
ifuse
|
ifuse
|
||||||
dash
|
dash
|
||||||
dolphin
|
dolphin
|
||||||
guix
|
# guix
|
||||||
freecad
|
freecad
|
||||||
picard
|
picard
|
||||||
brightnessctl
|
brightnessctl
|
||||||
|
|
@ -99,7 +99,7 @@ with lib;
|
||||||
qrencode
|
qrencode
|
||||||
# brave
|
# brave
|
||||||
# scribus
|
# scribus
|
||||||
# darktable
|
darktable
|
||||||
# qutebrowser
|
# qutebrowser
|
||||||
virt-manager
|
virt-manager
|
||||||
virt-viewer
|
virt-viewer
|
||||||
|
|
@ -138,12 +138,13 @@ with lib;
|
||||||
kdenlive
|
kdenlive
|
||||||
# olive-editor
|
# olive-editor
|
||||||
# davinci-resolve
|
# davinci-resolve
|
||||||
natron
|
# natron
|
||||||
glaxnimate
|
glaxnimate
|
||||||
mediainfo
|
mediainfo
|
||||||
libmediainfo
|
libmediainfo
|
||||||
pqiv
|
pqiv
|
||||||
plasma5Packages.audiotube
|
plasma5Packages.audiotube
|
||||||
|
discord
|
||||||
# natron
|
# natron
|
||||||
# digikam
|
# digikam
|
||||||
rubberband
|
rubberband
|
||||||
|
|
|
||||||
473
qmk/manifest.scm
473
qmk/manifest.scm
|
|
@ -1,473 +0,0 @@
|
||||||
;;; GNU Guix manifest for the QMK Firmware development environment
|
|
||||||
;;; Copyright © 2021-2023 Sergey Vlasov <sigprof@gmail.com>
|
|
||||||
;;; Copyright © 2022 Mark Dawson <markgdawson@gmail.com>
|
|
||||||
;;;
|
|
||||||
;;; This program is free software: you can redistribute it and/or modify
|
|
||||||
;;; it under the terms of the GNU General Public License as published by
|
|
||||||
;;; the Free Software Foundation, either version 3 of the License, or
|
|
||||||
;;; (at your option) any later version.
|
|
||||||
;;;
|
|
||||||
;;; This program is distributed in the hope that it will be useful,
|
|
||||||
;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
;;; GNU General Public License for more details.
|
|
||||||
;;;
|
|
||||||
;;; You should have received a copy of the GNU General Public License
|
|
||||||
;;; along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
;; This manifest file can be used to set up a development environment for the
|
|
||||||
;; QMK Firmware (https://github.com/qmk/qmk_firmware):
|
|
||||||
;;
|
|
||||||
;; $ guix shell -m path/to/manifest.scm
|
|
||||||
;;
|
|
||||||
;; Or, if this manifest.scm file is in the current directory, "guix shell" will
|
|
||||||
;; load it automatically when invoked without parameters:
|
|
||||||
;;
|
|
||||||
;; $ guix shell
|
|
||||||
;;
|
|
||||||
;; The resulting environment provides the "qmk" command that can be used to
|
|
||||||
;; compile the QMK firmware, and also the required toolchains for Arm-based and
|
|
||||||
;; AVR-based MCUs; it also provides some common flashing tools that are used
|
|
||||||
;; with those MCUs.
|
|
||||||
;;
|
|
||||||
;; Note that the system-wide configuration such as udev rules is not handled
|
|
||||||
;; here, therefore commands such as "qmk flash" or "qmk console" that actually
|
|
||||||
;; need to access the hardware may fail if that setup is not done.
|
|
||||||
|
|
||||||
(use-modules
|
|
||||||
(ice-9 match)
|
|
||||||
(srfi srfi-1)
|
|
||||||
(guix licenses)
|
|
||||||
(guix packages)
|
|
||||||
(guix download)
|
|
||||||
(guix git-download)
|
|
||||||
(guix build-system pyproject)
|
|
||||||
(guix build-system python)
|
|
||||||
(guix build-system trivial)
|
|
||||||
(guix search-paths))
|
|
||||||
|
|
||||||
(use-package-modules
|
|
||||||
avr
|
|
||||||
base
|
|
||||||
bash
|
|
||||||
check
|
|
||||||
commencement
|
|
||||||
compression
|
|
||||||
embedded
|
|
||||||
flashing-tools
|
|
||||||
libusb
|
|
||||||
python
|
|
||||||
python-build
|
|
||||||
python-check
|
|
||||||
python-xyz
|
|
||||||
version-control
|
|
||||||
wget)
|
|
||||||
|
|
||||||
;; Some Python modules that are required by QMK are not yet packaged for Guix;
|
|
||||||
;; define packages for those modules here.
|
|
||||||
|
|
||||||
(define python-spinners
|
|
||||||
(package
|
|
||||||
(name "python-spinners")
|
|
||||||
(version "0.0.24")
|
|
||||||
(source
|
|
||||||
(origin
|
|
||||||
(method url-fetch)
|
|
||||||
(uri (pypi-uri "spinners" version))
|
|
||||||
(sha256 (base32 "0zz2z6dpdjdq5z8m8w8dfi8by0ih1zrdq0caxm1anwhxg2saxdhy"))))
|
|
||||||
(build-system python-build-system)
|
|
||||||
(arguments
|
|
||||||
`(#:phases
|
|
||||||
(modify-phases %standard-phases
|
|
||||||
(add-before 'build 'patch-requirements-dev-txt
|
|
||||||
(lambda _
|
|
||||||
;; Update requirements from dependency==version
|
|
||||||
;; to dependency>=version
|
|
||||||
(substitute* "requirements-dev.txt"
|
|
||||||
(("==") ">="))
|
|
||||||
#t)))))
|
|
||||||
(native-inputs
|
|
||||||
`(("python-coverage" ,python-coverage)
|
|
||||||
("python-nose" ,python-nose)
|
|
||||||
("python-pylint" ,python-pylint)
|
|
||||||
("python-tox" ,python-tox)))
|
|
||||||
(home-page "https://github.com/manrajgrover/py-spinners")
|
|
||||||
(synopsis "More than 60 spinners for terminal")
|
|
||||||
(description "More than 60 spinners for terminal, python wrapper for amazing node library cli-spinners.")
|
|
||||||
(license expat)))
|
|
||||||
|
|
||||||
(define python-log-symbols
|
|
||||||
(package
|
|
||||||
(name "python-log-symbols")
|
|
||||||
(version "0.0.14")
|
|
||||||
(source
|
|
||||||
(origin
|
|
||||||
(method url-fetch)
|
|
||||||
(uri (pypi-uri "log_symbols" version))
|
|
||||||
(sha256 (base32 "0mh5d0igw33libfmbsr1ri1p1y644p36nwaa2w6kzrd8w5pvq2yg"))))
|
|
||||||
(build-system python-build-system)
|
|
||||||
(arguments
|
|
||||||
`(#:phases
|
|
||||||
(modify-phases %standard-phases
|
|
||||||
(add-before 'build 'patch-requirements-dev-txt
|
|
||||||
(lambda _
|
|
||||||
;; Update requirements from dependency==version
|
|
||||||
;; to dependency>=version
|
|
||||||
(substitute* "requirements-dev.txt"
|
|
||||||
(("==") ">="))
|
|
||||||
#t)))))
|
|
||||||
(native-inputs
|
|
||||||
`(("python-coverage" ,python-coverage)
|
|
||||||
("python-nose" ,python-nose)
|
|
||||||
("python-pylint" ,python-pylint)
|
|
||||||
("python-tox" ,python-tox)))
|
|
||||||
(propagated-inputs
|
|
||||||
`(("python-colorama" ,python-colorama)))
|
|
||||||
(home-page "https://github.com/manrajgrover/py-log-symbols")
|
|
||||||
(synopsis "Colored symbols for various log levels for Python")
|
|
||||||
(description "Colored symbols for various log levels for Python.")
|
|
||||||
(license expat)))
|
|
||||||
|
|
||||||
(define python-halo
|
|
||||||
(package
|
|
||||||
(name "python-halo")
|
|
||||||
(version "0.0.31")
|
|
||||||
(source
|
|
||||||
(origin
|
|
||||||
(method url-fetch)
|
|
||||||
(uri (pypi-uri "halo" version))
|
|
||||||
(sha256 (base32 "1mn97h370ggbc9vi6x8r6akd5q8i512y6kid2nvm67g93r9a6rvv"))))
|
|
||||||
(build-system python-build-system)
|
|
||||||
(native-inputs
|
|
||||||
`(("python-coverage" ,python-coverage)
|
|
||||||
("python-nose" ,python-nose)
|
|
||||||
("python-pylint" ,python-pylint)
|
|
||||||
("python-tox" ,python-tox)
|
|
||||||
("python-twine" ,python-twine)))
|
|
||||||
(propagated-inputs
|
|
||||||
`(("python-log-symbols" ,python-log-symbols)
|
|
||||||
("python-spinners" ,python-spinners)
|
|
||||||
("python-termcolor" ,python-termcolor)
|
|
||||||
("python-colorama" ,python-colorama)
|
|
||||||
("python-six" ,python-six)))
|
|
||||||
(home-page "https://github.com/manrajgrover/halo")
|
|
||||||
(synopsis "Beautiful spinners for terminal, IPython and Jupyter")
|
|
||||||
(description "Beautiful spinners for terminal, IPython and Jupyter.")
|
|
||||||
(license expat)))
|
|
||||||
|
|
||||||
(define python-milc
|
|
||||||
(package
|
|
||||||
(name "python-milc")
|
|
||||||
(version "1.6.6")
|
|
||||||
(source
|
|
||||||
(origin
|
|
||||||
(method url-fetch)
|
|
||||||
(uri (pypi-uri "milc" version))
|
|
||||||
(sha256 (base32 "007hdwp659s1wfld92pxdgjz9ijvh949wyf1cbmyzkma30vng8d4"))))
|
|
||||||
(build-system python-build-system)
|
|
||||||
(propagated-inputs
|
|
||||||
`(("python-appdirs" ,python-appdirs)
|
|
||||||
("python-argcomplete" ,python-argcomplete)
|
|
||||||
("python-colorama" ,python-colorama)
|
|
||||||
("python-halo" ,python-halo)
|
|
||||||
("python-spinners" ,python-spinners)))
|
|
||||||
(home-page "https://milc.clueboard.co/")
|
|
||||||
(synopsis "Batteries-Included Python 3 CLI Framework")
|
|
||||||
(description "MILC is a framework for writing CLI applications in Python 3.6+. It gives you all the features users expect from a modern CLI tool out of the box.")
|
|
||||||
(license expat)))
|
|
||||||
|
|
||||||
(define python-hjson
|
|
||||||
(package
|
|
||||||
(name "python-hjson")
|
|
||||||
(version "3.1.0")
|
|
||||||
(source
|
|
||||||
(origin
|
|
||||||
;; Sources on pypi don't contain data files for tests
|
|
||||||
(method git-fetch)
|
|
||||||
(uri (git-reference
|
|
||||||
(url "https://github.com/hjson/hjson-py")
|
|
||||||
;; No proper v3.1.0 tag on github, but the actual code seems to
|
|
||||||
;; match what's on pypi
|
|
||||||
(commit "1687b811fcbbc54b5ac71cfbaa99f805e406fbcb")))
|
|
||||||
(file-name (git-file-name name version))
|
|
||||||
(sha256 (base32 "1qfqnhvfx5mm7bdajjnnagmvns1zxyksjzh3k5la2ag6a8bp5gki"))))
|
|
||||||
(build-system python-build-system)
|
|
||||||
(home-page "http://github.com/hjson/hjson-py")
|
|
||||||
(synopsis "Human JSON implementation for Python")
|
|
||||||
(description "Hjson is a syntax extension to JSON. It is intended to be used like a user interface for humans, to read and edit before passing the JSON data to the machine. This package contains a Python library for parsing and generating Hjson.")
|
|
||||||
(license expat)))
|
|
||||||
|
|
||||||
(define python-dotty-dict
|
|
||||||
(package
|
|
||||||
(name "python-dotty-dict")
|
|
||||||
(version "1.3.1")
|
|
||||||
(source
|
|
||||||
(origin
|
|
||||||
;; Sources on pypi don't contain data files for tests
|
|
||||||
(method git-fetch)
|
|
||||||
(uri (git-reference
|
|
||||||
(url "https://github.com/pawelzny/dotty_dict")
|
|
||||||
(commit (string-append "v" version))))
|
|
||||||
(file-name (git-file-name name version))
|
|
||||||
(sha256 (base32 "0rs83pglkgb4sfnk09rskg8c53hvl7mkjw4vfgl5xc8z13vyi3li"))))
|
|
||||||
(build-system python-build-system)
|
|
||||||
(arguments
|
|
||||||
`(#:phases (modify-phases %standard-phases
|
|
||||||
(add-before 'build 'pretend-version
|
|
||||||
;; Workaround for building from a checkout without git metadata
|
|
||||||
(lambda _
|
|
||||||
(setenv "SETUPTOOLS_SCM_PRETEND_VERSION" ,version))))))
|
|
||||||
(native-inputs
|
|
||||||
`(("python-pytest" ,python-pytest)
|
|
||||||
("python-setuptools-scm" ,python-setuptools-scm)))
|
|
||||||
(home-page "https://github.com/pawelzny/dotty_dict")
|
|
||||||
(synopsis "Dictionary wrapper for quick access to deeply nested keys")
|
|
||||||
(description "Dictionary wrapper for quick access to deeply nested keys.")
|
|
||||||
(license expat)))
|
|
||||||
|
|
||||||
(define python-hid
|
|
||||||
(package
|
|
||||||
(name "python-hid")
|
|
||||||
(version "1.0.5")
|
|
||||||
(source
|
|
||||||
(origin
|
|
||||||
(method url-fetch)
|
|
||||||
(uri (pypi-uri "hid" version))
|
|
||||||
(sha256 (base32 "1s5hvfbmnlmifswr5514f4xxn5rcd429bdcdqzgwkdxrg9zlx58y"))))
|
|
||||||
(build-system python-build-system)
|
|
||||||
(arguments
|
|
||||||
`(#:modules ((srfi srfi-1)
|
|
||||||
(srfi srfi-26)
|
|
||||||
(guix build utils)
|
|
||||||
(guix build python-build-system))
|
|
||||||
#:phases
|
|
||||||
(modify-phases %standard-phases
|
|
||||||
(add-after 'unpack 'fix-hidapi-reference
|
|
||||||
(lambda* (#:key inputs #:allow-other-keys)
|
|
||||||
(substitute* "hid/__init__.py"
|
|
||||||
(("library_paths = \\(")
|
|
||||||
(string-append
|
|
||||||
"library_paths = ('"
|
|
||||||
(find (negate symbolic-link?)
|
|
||||||
(find-files (assoc-ref inputs "hidapi")
|
|
||||||
"^libhidapi-.*\\.so\\..*"))
|
|
||||||
"',")))
|
|
||||||
#t)))))
|
|
||||||
(inputs
|
|
||||||
`(("hidapi" ,hidapi)))
|
|
||||||
(native-inputs
|
|
||||||
`(("python-nose" ,python-nose)))
|
|
||||||
(home-page "https://github.com/apmorton/pyhidapi")
|
|
||||||
(synopsis "hidapi bindings in ctypes")
|
|
||||||
(description "Python wrapper for the hidapi library using ctypes.")
|
|
||||||
(license expat)))
|
|
||||||
|
|
||||||
;; "python-qmk" is the QMK CLI package which provides the "qmk" command.
|
|
||||||
|
|
||||||
(define python-qmk
|
|
||||||
(package
|
|
||||||
(name "python-qmk")
|
|
||||||
(version "1.1.2")
|
|
||||||
(source
|
|
||||||
(origin
|
|
||||||
(method url-fetch)
|
|
||||||
(uri (pypi-uri "qmk" version))
|
|
||||||
(sha256 (base32 "1619q9v90740dbg8xpzqlhwcasz42xj737803aiip8qc3a7zhwgq"))))
|
|
||||||
(build-system pyproject-build-system)
|
|
||||||
(arguments
|
|
||||||
`(#:tests? #f))
|
|
||||||
(propagated-inputs
|
|
||||||
`(("python-hid" ,python-hid)
|
|
||||||
("python-pyusb" ,python-pyusb)
|
|
||||||
("python-milc" ,python-milc)
|
|
||||||
("python-setuptools" ,python-setuptools)
|
|
||||||
("python-dotty-dict" ,python-dotty-dict)
|
|
||||||
("python-hjson" ,python-hjson)
|
|
||||||
("python-jsonschema" ,python-jsonschema)
|
|
||||||
("python-pillow" ,python-pillow)
|
|
||||||
("python-pygments" ,python-pygments)
|
|
||||||
("python-pyserial" ,python-pyserial)))
|
|
||||||
(home-page "https://qmk.fm/")
|
|
||||||
(synopsis "QMK CLI is a program to help users work with QMK Firmware")
|
|
||||||
(description "QMK CLI provides various functions for working with QMK Firmware: getting the QMK Firmware sources, setting up the build environment, compiling and flashing the firmware, accessing the debug console provided by the firmware, and many more functions used for the QMK Firmware configuration and development.")
|
|
||||||
(license expat)))
|
|
||||||
|
|
||||||
;; Workaround for https://issues.guix.info/issue/39794#8 (the bug report is
|
|
||||||
;; closed, but the issue is not actually fixed) - all cross compilers use the
|
|
||||||
;; same CROSS_*_PATH environment variables, therefore including more than one
|
|
||||||
;; cross compiler in the profile breaks all of them except the last one,
|
|
||||||
;; because the include and library paths from all cross compilers get combined
|
|
||||||
;; into the same variables.
|
|
||||||
|
|
||||||
(define (qmk-wrap-toolchain toolchain-name toolchain-package toolchain-env-prefix)
|
|
||||||
|
|
||||||
;; Make a new list of inputs by applying PROC to all packages listed in
|
|
||||||
;; INPUTS and keeping the same labels and outputs.
|
|
||||||
(define (map-inputs proc inputs)
|
|
||||||
(define (rewrite input)
|
|
||||||
(match input
|
|
||||||
((label (? package? package) outputs ...)
|
|
||||||
(cons* label (proc package) outputs))
|
|
||||||
(_
|
|
||||||
input)))
|
|
||||||
(map rewrite inputs))
|
|
||||||
|
|
||||||
;; Return the list of search path specifications from SEARCH-PATHS which
|
|
||||||
;; variable names are not found in the VAR-NAMES alist.
|
|
||||||
(define (delete-from-search-paths search-paths var-names)
|
|
||||||
(define (keep search-path)
|
|
||||||
(not (assoc (search-path-specification-variable search-path) var-names)))
|
|
||||||
(filter keep search-paths))
|
|
||||||
|
|
||||||
;; Return package ORIGINAL with search path specifications matching VAR-NAMES
|
|
||||||
;; removed from native-search-paths.
|
|
||||||
(define (package-without-native-search-paths original var-names)
|
|
||||||
(package/inherit original
|
|
||||||
(native-search-paths
|
|
||||||
(delete-from-search-paths (package-native-search-paths original) var-names))))
|
|
||||||
|
|
||||||
;; Make a new list of inputs from INPUTS by removing native search path
|
|
||||||
;; specifications matching VAR-NAMES from all listed packages.
|
|
||||||
(define (inputs-without-native-search-paths inputs var-names)
|
|
||||||
(define (rewrite package)
|
|
||||||
(package-without-native-search-paths package var-names))
|
|
||||||
(map-inputs rewrite inputs))
|
|
||||||
|
|
||||||
(let* ((wrapper-name (string-append "qmk-" toolchain-name))
|
|
||||||
(modules '((guix build utils)))
|
|
||||||
|
|
||||||
;; List of search paths set by the toolchain that must be saved.
|
|
||||||
(saved-search-paths
|
|
||||||
(filter
|
|
||||||
(lambda (search-path)
|
|
||||||
(let* ((var (search-path-specification-variable search-path)))
|
|
||||||
(and (string-prefix? "CROSS_" var)
|
|
||||||
(string-suffix? "_PATH" var))))
|
|
||||||
(package-transitive-native-search-paths toolchain-package)))
|
|
||||||
|
|
||||||
;; Association list that maps the original environment variable names
|
|
||||||
;; for search paths to the architecture specific environment variable
|
|
||||||
;; names (which must not collide between different toolchains).
|
|
||||||
(search-path-var-names
|
|
||||||
(map
|
|
||||||
(lambda (search-path)
|
|
||||||
(let* ((var (search-path-specification-variable search-path)))
|
|
||||||
(cons var (string-append toolchain-env-prefix "_" var))))
|
|
||||||
saved-search-paths))
|
|
||||||
|
|
||||||
;; List of new search paths with architecture specific environment
|
|
||||||
;; variable names.
|
|
||||||
(new-search-paths
|
|
||||||
(map
|
|
||||||
(lambda (search-path)
|
|
||||||
(search-path-specification
|
|
||||||
(inherit search-path)
|
|
||||||
(variable
|
|
||||||
(assoc-ref search-path-var-names
|
|
||||||
(search-path-specification-variable search-path)))))
|
|
||||||
saved-search-paths))
|
|
||||||
|
|
||||||
;; Shell code for setting the environment variable values that would
|
|
||||||
;; actually be used by the compiler from the architecture specific
|
|
||||||
;; environment variables. The code is a sequence of lines like:
|
|
||||||
;; VAR="${ARCH_VAR}" \
|
|
||||||
;; (the last line also contains a backslash and is intended to
|
|
||||||
;; combine with the "exec" statement at the next line in the shell
|
|
||||||
;; wrapper script).
|
|
||||||
(search-path-copy-code
|
|
||||||
(apply string-append
|
|
||||||
(map
|
|
||||||
(lambda (var-mapping)
|
|
||||||
(string-append (car var-mapping) "=\"${" (cdr var-mapping) "}\" \\\n"))
|
|
||||||
search-path-var-names)))
|
|
||||||
|
|
||||||
;; The toolchain package with all CROSS_*_PATH native search paths
|
|
||||||
;; removed from its propagated inputs (these variables will be set to
|
|
||||||
;; their original values in the wrapper scripts, but leaving them
|
|
||||||
;; listed in native-search-paths will cause them to be exported with
|
|
||||||
;; inappropriately combined values taken from multiple different
|
|
||||||
;; toolchains).
|
|
||||||
(new-toolchain-package
|
|
||||||
(package/inherit toolchain-package
|
|
||||||
(propagated-inputs
|
|
||||||
(inputs-without-native-search-paths
|
|
||||||
(package-propagated-inputs toolchain-package)
|
|
||||||
search-path-var-names)))))
|
|
||||||
|
|
||||||
;; Generate a wrapper package with most properties copied from the original
|
|
||||||
;; toolchain package.
|
|
||||||
(package
|
|
||||||
(name wrapper-name)
|
|
||||||
(version (package-version toolchain-package))
|
|
||||||
(source #f)
|
|
||||||
(build-system trivial-build-system)
|
|
||||||
(arguments
|
|
||||||
`(#:modules ,modules
|
|
||||||
#:builder
|
|
||||||
(begin
|
|
||||||
;; Generate wrapper scripts for all executables from the "gcc"
|
|
||||||
;; package in the toolchain.
|
|
||||||
(use-modules ,@modules)
|
|
||||||
(let* ((wrapper-bin-dir (string-append %output "/bin"))
|
|
||||||
(bash (assoc-ref %build-inputs "bash"))
|
|
||||||
(gcc (assoc-ref %build-inputs "gcc"))
|
|
||||||
(bash-binary (string-append bash "/bin/bash"))
|
|
||||||
(gcc-bin-dir (string-append gcc "/bin")))
|
|
||||||
(mkdir %output)
|
|
||||||
(mkdir wrapper-bin-dir)
|
|
||||||
(for-each
|
|
||||||
(lambda (bin)
|
|
||||||
(let* ((bin-name (basename bin))
|
|
||||||
(wrapper (string-append wrapper-bin-dir "/" bin-name)))
|
|
||||||
(call-with-output-file wrapper
|
|
||||||
(lambda (port)
|
|
||||||
(format port "#!~a~%~aexec ~a \"$@\"~%"
|
|
||||||
bash-binary
|
|
||||||
,search-path-copy-code
|
|
||||||
bin)))
|
|
||||||
(chmod wrapper #o755)))
|
|
||||||
(find-files gcc-bin-dir))
|
|
||||||
#t))))
|
|
||||||
(inputs
|
|
||||||
`(("bash" ,bash)
|
|
||||||
("gcc" ,(first (assoc-ref (package-transitive-target-inputs toolchain-package) "gcc")))))
|
|
||||||
(propagated-inputs
|
|
||||||
`((,toolchain-name ,new-toolchain-package)))
|
|
||||||
(native-search-paths new-search-paths)
|
|
||||||
(synopsis (package-synopsis toolchain-package))
|
|
||||||
(description (package-description toolchain-package))
|
|
||||||
(home-page (package-home-page toolchain-package))
|
|
||||||
(license (package-license toolchain-package)))))
|
|
||||||
|
|
||||||
(define qmk-avr-toolchain
|
|
||||||
(qmk-wrap-toolchain "avr-toolchain"
|
|
||||||
avr-toolchain
|
|
||||||
"AVR"))
|
|
||||||
|
|
||||||
(define qmk-arm-none-eabi-nano-toolchain-7-2018-q2-update
|
|
||||||
(qmk-wrap-toolchain "arm-none-eabi-nano-toolchain-7-2018-q2-update"
|
|
||||||
arm-none-eabi-nano-toolchain-7-2018-q2-update
|
|
||||||
"ARM_NONE_EABI_NANO"))
|
|
||||||
|
|
||||||
;; Finally make the manifest with all required packages.
|
|
||||||
|
|
||||||
(packages->manifest
|
|
||||||
(list
|
|
||||||
|
|
||||||
;; Toolchains
|
|
||||||
qmk-arm-none-eabi-nano-toolchain-7-2018-q2-update
|
|
||||||
qmk-avr-toolchain
|
|
||||||
|
|
||||||
;; Flashing tools
|
|
||||||
avrdude
|
|
||||||
dfu-programmer
|
|
||||||
dfu-util
|
|
||||||
teensy-loader-cli
|
|
||||||
|
|
||||||
;; Other tools required for build
|
|
||||||
git
|
|
||||||
gnu-make
|
|
||||||
python
|
|
||||||
|
|
||||||
;; QMK CLI
|
|
||||||
python-qmk))
|
|
||||||
1757
scripts/quicklisp.lisp
Normal file
1757
scripts/quicklisp.lisp
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -1,6 +1,10 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
currentdir=$(pwd)
|
currentdir=$(pwd)
|
||||||
cd ~/.dotfiles
|
if [[hostname == "kaladin"]]; then
|
||||||
|
cd ~/.config/dotfiles
|
||||||
|
else
|
||||||
|
cd ~/.dotfiles
|
||||||
|
fi
|
||||||
nix flake update
|
nix flake update
|
||||||
nix flake lock
|
nix flake lock
|
||||||
cd $currentdir
|
cd $currentdir
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
currentdir=$(pwd)
|
currentdir=$(pwd)
|
||||||
cd ~/.dotfiles
|
cd ~/.config/dotfiles/
|
||||||
nixos-rebuild --use-remote-sudo switch --show-trace --verbose --impure --flake .#
|
nixos-rebuild --use-remote-sudo switch --show-trace --verbose --impure --flake .#
|
||||||
cd $currentdir
|
cd $currentdir
|
||||||
|
|
|
||||||
|
|
@ -1,8 +0,0 @@
|
||||||
[Unit]
|
|
||||||
Description=ActivityWatch Service - Automatic Time Tracker
|
|
||||||
|
|
||||||
[Service]
|
|
||||||
ExecStart=/usr/bin/aw-qt
|
|
||||||
|
|
||||||
[Install]
|
|
||||||
WantedBy=default.target
|
|
||||||
|
|
@ -1,8 +0,0 @@
|
||||||
[Unit]
|
|
||||||
Description=Jellyfin MPV
|
|
||||||
|
|
||||||
[Service]
|
|
||||||
ExecStart=jellyfin-mpv-shim
|
|
||||||
|
|
||||||
[Install]
|
|
||||||
WantedBy=default.target
|
|
||||||
|
|
@ -1,8 +0,0 @@
|
||||||
[Unit]
|
|
||||||
Description=lolcate updater
|
|
||||||
|
|
||||||
[Service]
|
|
||||||
ExecStart=lolcate --update
|
|
||||||
|
|
||||||
[Install]
|
|
||||||
WantedBy=default.target
|
|
||||||
|
|
@ -1,10 +0,0 @@
|
||||||
|
|
||||||
[Unit]
|
|
||||||
Description=run lolcate updater every 20min
|
|
||||||
|
|
||||||
[Timer]
|
|
||||||
OnBootSec=1min
|
|
||||||
OnUnitActiveSec=20min
|
|
||||||
|
|
||||||
[Install]
|
|
||||||
WantedBy=timers.target
|
|
||||||
|
|
@ -1,8 +0,0 @@
|
||||||
[Unit]
|
|
||||||
Description=mbsync automated sync of mail
|
|
||||||
|
|
||||||
[Service]
|
|
||||||
ExecStart=/home/chris/scripts/mailsync
|
|
||||||
|
|
||||||
[Install]
|
|
||||||
WantedBy=default.target
|
|
||||||
|
|
@ -1,9 +0,0 @@
|
||||||
[Unit]
|
|
||||||
Description=timer for syncing mail
|
|
||||||
|
|
||||||
[Timer]
|
|
||||||
OnStartupSec=2min
|
|
||||||
OnUnitActiveSec=5min
|
|
||||||
|
|
||||||
[Install]
|
|
||||||
WantedBy=timers.target
|
|
||||||
|
|
@ -1,14 +0,0 @@
|
||||||
[Unit]
|
|
||||||
Description=Service to keep secrets of applications
|
|
||||||
Documentation=https://github.com/yousefvand/secret-service
|
|
||||||
|
|
||||||
[Install]
|
|
||||||
WantedBy=default.target
|
|
||||||
|
|
||||||
[Service]
|
|
||||||
Type=simple
|
|
||||||
RestartSec=30
|
|
||||||
Restart=always
|
|
||||||
Environment="MASTERPASSWORD=Gr@$$B00ts#21"
|
|
||||||
WorkingDirectory=/usr/bin/
|
|
||||||
ExecStart=/usr/bin/secretserviced
|
|
||||||
|
|
@ -11,36 +11,16 @@
|
||||||
boot.extraModulePackages = [ ];
|
boot.extraModulePackages = [ ];
|
||||||
|
|
||||||
fileSystems."/" =
|
fileSystems."/" =
|
||||||
{ device = "/dev/disk/by-uuid/af62c65b-943d-4a8a-8f77-ad7826729aba";
|
{ device = "/dev/disk/by-uuid/e5add982-fbdf-45e6-9e96-ea81c3ceff37";
|
||||||
fsType = "btrfs";
|
fsType = "ext4";
|
||||||
options = [ "subvol=@" "noatime" "ssd" "space_cache" "clear_cache" "compress=zstd" ];
|
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems."/home" =
|
fileSystems."/boot" =
|
||||||
{ device = "/dev/disk/by-uuid/af62c65b-943d-4a8a-8f77-ad7826729aba";
|
{ device = "/dev/disk/by-uuid/1D14-97A8";
|
||||||
fsType = "btrfs";
|
fsType = "vfat";
|
||||||
options = [ "subvol=@home" "noatime" "ssd" "space_cache" "clear_cache" "compress=zstd" ];
|
options = [ "fmask=0022" "dmask=0022" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems."/snapshots" =
|
|
||||||
{ device = "/dev/disk/by-uuid/af62c65b-943d-4a8a-8f77-ad7826729aba";
|
|
||||||
fsType = "btrfs";
|
|
||||||
options = [ "subvol=snapshots" "noatime" "ssd" "space_cache" "clear_cache" "compress=zstd" ];
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
#fileSystems."/nix" =
|
|
||||||
# { device = "/dev/disk/by-uuid/9b5a1a62-0de6-4e07-a541-634736980d10";
|
|
||||||
# fsType = "btrfs";
|
|
||||||
# options = [ "subvol=@nix" "noatime" "ssd" "space_cache" "clear_cache" "compress=zstd" ];
|
|
||||||
# };
|
|
||||||
|
|
||||||
#fileSystems."/var/log" =
|
|
||||||
# { device = "/dev/disk/by-uuid/9b5a1a62-0de6-4e07-a541-634736980d10";
|
|
||||||
# fsType = "btrfs";
|
|
||||||
# options = [ "subvol=@log" "noatime" "ssd" "space_cache" "clear_cache" "compress=zstd" ];
|
|
||||||
# };
|
|
||||||
|
|
||||||
fileSystems."/run/media/chris/Storage" =
|
fileSystems."/run/media/chris/Storage" =
|
||||||
{ device = "/dev/disk/by-uuid/4c7d4273-7b72-4aa8-8e1c-e281543d06cb";
|
{ device = "/dev/disk/by-uuid/4c7d4273-7b72-4aa8-8e1c-e281543d06cb";
|
||||||
fsType = "btrfs";
|
fsType = "btrfs";
|
||||||
|
|
@ -52,12 +32,6 @@
|
||||||
fsType = "ext4";
|
fsType = "ext4";
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems."/boot" =
|
|
||||||
{ device = "/dev/disk/by-uuid/35A0-C1F1";
|
|
||||||
fsType = "vfat";
|
|
||||||
options = [ "fmask=0022" "dmask=0022" ];
|
|
||||||
};
|
|
||||||
|
|
||||||
swapDevices = [ ];
|
swapDevices = [ ];
|
||||||
|
|
||||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue