added and moved

This commit is contained in:
alsaiduq-lab 2025-11-09 11:27:50 -07:00
parent 57bbe33fbf
commit a75c7e105c
15 changed files with 254 additions and 246 deletions

395
flake.lock generated
View file

@ -20,11 +20,11 @@
]
},
"locked": {
"lastModified": 1760101617,
"narHash": "sha256-8jf/3ZCi+B7zYpIyV04+3wm72BD7Z801IlOzsOACR7I=",
"lastModified": 1762356719,
"narHash": "sha256-qwd/xdoOya1m8FENle+4hWnydCtlXUWLAW/Auk6WL7s=",
"owner": "hyprwm",
"repo": "aquamarine",
"rev": "1826a9923881320306231b1c2090379ebf9fa4f8",
"rev": "6d0b3567584691bf9d8fedb5d0093309e2f979c7",
"type": "github"
},
"original": {
@ -38,19 +38,16 @@
"dgop": [
"dgop"
],
"dms-cli": [
"dms-cli"
],
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1761610875,
"narHash": "sha256-hI0+1nQwQQM6i1p5x2X6Z8CxXjUYWRbKj8P2XbMopSw=",
"lastModified": 1763764254,
"narHash": "sha256-+40Kw27qiSK/4BTAUXRa0xUo2dBCA9m5diOvLYPKDR4=",
"owner": "AvengeMedia",
"repo": "DankMaterialShell",
"rev": "53507ef56bfeb453c4bc15c4011aeea98263ca27",
"rev": "f8dc6ad2bc7361a7cfb40d70bd0fcf16aba6e4de",
"type": "github"
},
"original": {
@ -66,11 +63,11 @@
]
},
"locked": {
"lastModified": 1760238269,
"narHash": "sha256-7CeGZM/Z/5Qt3AYByCRohGYGR1MRuXYzTTbkV/JxyAs=",
"lastModified": 1762835999,
"narHash": "sha256-UykYGrGFOFTmDpKTLNxj1wvd1gbDG4TkqLNSbV0TYwk=",
"owner": "AvengeMedia",
"repo": "dgop",
"rev": "95acdfce2d323e28fa8f5a4f345160962034f2b5",
"rev": "799301991cd5dcea9b64245f9d500dcc76615653",
"type": "github"
},
"original": {
@ -86,11 +83,11 @@
]
},
"locked": {
"lastModified": 1760701190,
"narHash": "sha256-y7UhnWlER8r776JsySqsbTUh2Txf7K30smfHlqdaIQw=",
"lastModified": 1763651264,
"narHash": "sha256-8vvwZbw0s7YvBMJeyPVpWke6lg6ROgtts5N2/SMCcv4=",
"owner": "nix-community",
"repo": "disko",
"rev": "3a9450b26e69dcb6f8de6e2b07b3fc1c288d85f5",
"rev": "e86a89079587497174ccab6d0d142a65811a4fd9",
"type": "github"
},
"original": {
@ -101,17 +98,16 @@
},
"dms-cli": {
"inputs": {
"gomod2nix": "gomod2nix",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1761596158,
"narHash": "sha256-PDILfm8U6CiSHLG7f79wpHJxXHre9LSiXtoyWvVpp0s=",
"lastModified": 1763078370,
"narHash": "sha256-wsYqJlLdRSlJpRE0tIuuPMU6aOyhMdV237rEG/enUxY=",
"owner": "AvengeMedia",
"repo": "danklinux",
"rev": "fce392f4c076961bfa3a6ca00ac27270cef07a91",
"rev": "7a083a0d6d087d41d0bc5077d03e662e1417ce3c",
"type": "github"
},
"original": {
@ -157,11 +153,11 @@
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1760948891,
"narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=",
"lastModified": 1762980239,
"narHash": "sha256-8oNVE8TrD19ulHinjaqONf9QWCKK+w4url56cdStMpM=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04",
"rev": "52a2caecc898d0b46b2b905f058ccc5081f842da",
"type": "github"
},
"original": {
@ -188,38 +184,20 @@
"type": "github"
}
},
"flake-utils_2": {
"inputs": {
"systems": "systems_2"
},
"locked": {
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"ghostty": {
"inputs": {
"flake-compat": "flake-compat",
"flake-utils": "flake-utils_2",
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs",
"zig": "zig",
"zon2nix": "zon2nix"
},
"locked": {
"lastModified": 1761598306,
"narHash": "sha256-0/bnV6NQk0oLzUTHm7Q02oe1xuNtDgKgQgWFGzUCXwI=",
"lastModified": 1763704826,
"narHash": "sha256-Q2ArFuRzdNqR8gK0g2eBfnwwPWmiIIU4TPWa+xNHtqc=",
"owner": "ghostty-org",
"repo": "ghostty",
"rev": "d40321a8d8ba4292cd55caf288989d4a91891b15",
"rev": "5f3645433c0ba5910c7da1f25aaa07efc2c84b64",
"type": "github"
},
"original": {
@ -250,33 +228,10 @@
"type": "github"
}
},
"gomod2nix": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": [
"dms-cli",
"nixpkgs"
]
},
"locked": {
"lastModified": 1756047880,
"narHash": "sha256-JeuGh9kA1SPL70fnvpLxkIkCWpTjtoPaus3jzvdna0k=",
"owner": "nix-community",
"repo": "gomod2nix",
"rev": "47d628dc3b506bd28632e47280c6b89d3496909d",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "v1.7.0",
"repo": "gomod2nix",
"type": "github"
}
},
"grim-hyprland": {
"inputs": {
"nixpkgs": "nixpkgs_3",
"systems": "systems_3"
"systems": "systems_2"
},
"locked": {
"lastModified": 1741705247,
@ -299,16 +254,15 @@
]
},
"locked": {
"lastModified": 1758463745,
"narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=",
"lastModified": 1763748372,
"narHash": "sha256-AUc78Qv3sWir0hvbmfXoZ7Jzq9VVL97l+sP9Jgms+JU=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3",
"rev": "d10a9b16b2a3ee28433f3d1c603f4e9f1fecb8e1",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "release-25.05",
"repo": "home-manager",
"type": "github"
}
@ -376,11 +330,11 @@
]
},
"locked": {
"lastModified": 1760445448,
"narHash": "sha256-fXGjL6dw31FPFRrmIemzGiNSlfvEJTJNsmadZi+qNhI=",
"lastModified": 1762462052,
"narHash": "sha256-6roLYzcDf4V38RUMSqycsOwAnqfodL6BmhRkUtwIgdA=",
"owner": "hyprwm",
"repo": "hyprgraphics",
"rev": "50fb9f069219f338a11cf0bcccb9e58357d67757",
"rev": "ffc999d980c7b3bca85d3ebd0a9fbadf984a8162",
"type": "github"
},
"original": {
@ -394,22 +348,22 @@
"aquamarine": "aquamarine",
"hyprcursor": "hyprcursor",
"hyprgraphics": "hyprgraphics",
"hyprland-guiutils": "hyprland-guiutils",
"hyprland-protocols": "hyprland-protocols",
"hyprland-qtutils": "hyprland-qtutils",
"hyprlang": "hyprlang",
"hyprutils": "hyprutils",
"hyprwayland-scanner": "hyprwayland-scanner",
"nixpkgs": "nixpkgs_5",
"pre-commit-hooks": "pre-commit-hooks",
"systems": "systems_4",
"systems": "systems_3",
"xdph": "xdph"
},
"locked": {
"lastModified": 1761601789,
"narHash": "sha256-F8HDu+xAZ2GhYRZPTMbFgXfA6VI7pN95juP3/llCKx8=",
"lastModified": 1763750925,
"narHash": "sha256-Q5IO8VKW2fFHb6Ix6auy6SEMA6NS6pNeuefBai4+PHY=",
"owner": "hyprwm",
"repo": "Hyprland",
"rev": "309c3c78485781a28ad9f5bef48b09ecb3b81473",
"rev": "abb2f7ee6fc99c31b6fac05568f29c92b59565df",
"type": "github"
},
"original": {
@ -434,6 +388,52 @@
"url": "ssh://git@github.com/alsaiduq-lab/hyprland-dots"
}
},
"hyprland-guiutils": {
"inputs": {
"aquamarine": [
"hyprland",
"aquamarine"
],
"hyprgraphics": [
"hyprland",
"hyprgraphics"
],
"hyprlang": [
"hyprland",
"hyprlang"
],
"hyprtoolkit": "hyprtoolkit",
"hyprutils": [
"hyprland",
"hyprutils"
],
"hyprwayland-scanner": [
"hyprland",
"hyprwayland-scanner"
],
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1762755186,
"narHash": "sha256-ZjjETUHtoEhVN7JI1Cbt3p/KcXpK8ZQaPHx7UkG1OgA=",
"owner": "hyprwm",
"repo": "hyprland-guiutils",
"rev": "66356e20a8ed348aa49c1b9ceace786e224225b3",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprland-guiutils",
"type": "github"
}
},
"hyprland-protocols": {
"inputs": {
"nixpkgs": [
@ -459,74 +459,6 @@
"type": "github"
}
},
"hyprland-qt-support": {
"inputs": {
"hyprlang": [
"hyprland",
"hyprland-qtutils",
"hyprlang"
],
"nixpkgs": [
"hyprland",
"hyprland-qtutils",
"nixpkgs"
],
"systems": [
"hyprland",
"hyprland-qtutils",
"systems"
]
},
"locked": {
"lastModified": 1749154592,
"narHash": "sha256-DO7z5CeT/ddSGDEnK9mAXm1qlGL47L3VAHLlLXoCjhE=",
"owner": "hyprwm",
"repo": "hyprland-qt-support",
"rev": "4c8053c3c888138a30c3a6c45c2e45f5484f2074",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprland-qt-support",
"type": "github"
}
},
"hyprland-qtutils": {
"inputs": {
"hyprland-qt-support": "hyprland-qt-support",
"hyprlang": [
"hyprland",
"hyprlang"
],
"hyprutils": [
"hyprland",
"hyprland-qtutils",
"hyprlang",
"hyprutils"
],
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1759080228,
"narHash": "sha256-RgDoAja0T1hnF0pTc56xPfLfFOO8Utol2iITwYbUhTk=",
"owner": "hyprwm",
"repo": "hyprland-qtutils",
"rev": "629b15c19fa4082e4ce6be09fdb89e8c3312aed7",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprland-qtutils",
"type": "github"
}
},
"hyprlang": {
"inputs": {
"hyprutils": [
@ -543,11 +475,11 @@
]
},
"locked": {
"lastModified": 1758927902,
"narHash": "sha256-LZgMds7M94+vuMql2bERQ6LiFFdhgsEFezE4Vn+Ys3A=",
"lastModified": 1763254292,
"narHash": "sha256-JNgz3Fz2KMzkT7aR72wsgu/xNeJB//LSmdilh8Z/Zao=",
"owner": "hyprwm",
"repo": "hyprlang",
"rev": "4dafa28d4f79877d67a7d1a654cddccf8ebf15da",
"rev": "deea98d5b61d066bdc7a68163edd2c4bd28d3a6b",
"type": "github"
},
"original": {
@ -556,6 +488,58 @@
"type": "github"
}
},
"hyprtoolkit": {
"inputs": {
"aquamarine": [
"hyprland",
"hyprland-guiutils",
"aquamarine"
],
"hyprgraphics": [
"hyprland",
"hyprland-guiutils",
"hyprgraphics"
],
"hyprlang": [
"hyprland",
"hyprland-guiutils",
"hyprlang"
],
"hyprutils": [
"hyprland",
"hyprland-guiutils",
"hyprutils"
],
"hyprwayland-scanner": [
"hyprland",
"hyprland-guiutils",
"hyprwayland-scanner"
],
"nixpkgs": [
"hyprland",
"hyprland-guiutils",
"nixpkgs"
],
"systems": [
"hyprland",
"hyprland-guiutils",
"systems"
]
},
"locked": {
"lastModified": 1762463729,
"narHash": "sha256-2fYkU/mdz8WKY3dkDPlE/j6hTxIwqultsx4gMMsMns0=",
"owner": "hyprwm",
"repo": "hyprtoolkit",
"rev": "88483bdee5329ec985f0c8f834c519cd18cfe532",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprtoolkit",
"type": "github"
}
},
"hyprutils": {
"inputs": {
"nixpkgs": [
@ -568,11 +552,11 @@
]
},
"locked": {
"lastModified": 1759619523,
"narHash": "sha256-r1ed7AR2ZEb2U8gy321/Xcp1ho2tzn+gG1te/Wxsj1A=",
"lastModified": 1763323331,
"narHash": "sha256-+Z0OfCo1MS8/aIutSAW5aJR9zTae1wz9kcJYMgpwN6M=",
"owner": "hyprwm",
"repo": "hyprutils",
"rev": "3df7bde01efb3a3e8e678d1155f2aa3f19e177ef",
"rev": "0c6411851cc779d551edc89b83966696201611aa",
"type": "github"
},
"original": {
@ -609,16 +593,14 @@
"nix-gaming": {
"inputs": {
"flake-parts": "flake-parts",
"nixpkgs": [
"nixpkgs"
]
"nixpkgs": "nixpkgs_6"
},
"locked": {
"lastModified": 1761616257,
"narHash": "sha256-MMMrpfS7kQoGCU9cufSdFUiSKftwgWyS98RdWl5muXM=",
"lastModified": 1763776301,
"narHash": "sha256-FD8dx7R543AFOnYX2sRwTGA4mcC1gVQ92D1RHzz6Cs4=",
"owner": "fufexan",
"repo": "nix-gaming",
"rev": "e647a985731e7a058db3f375de0f6fac71ddde2e",
"rev": "c34f0eefe470a12e486ee56d65e5e21a55161028",
"type": "github"
},
"original": {
@ -642,11 +624,11 @@
},
"nixpkgs-lib": {
"locked": {
"lastModified": 1754788789,
"narHash": "sha256-x2rJ+Ovzq0sCMpgfgGaaqgBSwY+LST+WbZ6TytnT9Rk=",
"lastModified": 1761765539,
"narHash": "sha256-b0yj6kfvO8ApcSE+QmA6mUfu8IYG6/uU28OFn4PaC8M=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "a73b9c743612e4244d865a2fdee11865283c04e6",
"rev": "719359f4562934ae99f5443f20aa06c2ffff91fc",
"type": "github"
},
"original": {
@ -702,11 +684,11 @@
},
"nixpkgs_5": {
"locked": {
"lastModified": 1761114652,
"narHash": "sha256-f/QCJM/YhrV/lavyCVz8iU3rlZun6d+dAiC3H+CDle4=",
"lastModified": 1763283776,
"narHash": "sha256-Y7TDFPK4GlqrKrivOcsHG8xSGqQx3A6c+i7novT85Uk=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "01f116e4df6a15f4ccdffb1bcd41096869fb385c",
"rev": "50a96edd8d0db6cc8db57dab6bb6d6ee1f3dc49a",
"type": "github"
},
"original": {
@ -718,11 +700,27 @@
},
"nixpkgs_6": {
"locked": {
"lastModified": 1761468971,
"narHash": "sha256-vY2OLVg5ZTobdroQKQQSipSIkHlxOTrIF1fsMzPh8w8=",
"lastModified": 1763312402,
"narHash": "sha256-3YJkOBrFpmcusnh7i8GXXEyh7qZG/8F5z5+717550Hk=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "78e34d1667d32d8a0ffc3eba4591ff256e80576e",
"rev": "85a6c4a07faa12aaccd81b36ba9bfc2bec974fa1",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_7": {
"locked": {
"lastModified": 1763622513,
"narHash": "sha256-1jQnuyu82FpiSxowrF/iFK6Toh9BYprfDqfs4BB+19M=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c58bc7f5459328e4afac201c5c4feb7c818d604b",
"type": "github"
},
"original": {
@ -735,11 +733,11 @@
"nvim-dots": {
"flake": false,
"locked": {
"lastModified": 1759115710,
"narHash": "sha256-IdLoHrGkhlqAJmfi4nRe2DAoHA5udyb5UTSCpNboaOo=",
"lastModified": 1763770049,
"narHash": "sha256-rSTmSFqyYXh/t/zsV46dHavshjJNlc1Qajb8K78blNA=",
"owner": "alsaiduq-lab",
"repo": "nvim-dotfiles",
"rev": "d251eb27eb70f67373aea50a15f1f71748af9039",
"rev": "2816b6522ce703c7d506064214f5dcb6bad149c5",
"type": "github"
},
"original": {
@ -778,11 +776,11 @@
]
},
"locked": {
"lastModified": 1760663237,
"narHash": "sha256-BflA6U4AM1bzuRMR8QqzPXqh8sWVCNDzOdsxXEguJIc=",
"lastModified": 1763319842,
"narHash": "sha256-YG19IyrTdnVn0l3DvcUYm85u3PaqBt6tI6VvolcuHnA=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "ca5b894d3e3e151ffc1db040b6ce4dcc75d31c37",
"rev": "7275fa67fbbb75891c16d9dee7d88e58aea2d761",
"type": "github"
},
"original": {
@ -798,11 +796,11 @@
]
},
"locked": {
"lastModified": 1761643228,
"narHash": "sha256-G16tcvlv9tHqrNQB8UTtdqTd6jur9wNuik1Kx6NDH5Y=",
"lastModified": 1763629934,
"narHash": "sha256-jWz10RbNAyylJbH4cUTLS/CsDjkd8gxfT8OsIgQIgEg=",
"ref": "refs/heads/master",
"rev": "1b147a2c78983877909f9e531fc8ce17c35a297a",
"revCount": 698,
"rev": "ed036d514b0fdbce03158a0b331305be166f4555",
"revCount": 708,
"type": "git",
"url": "https://git.outfoxxed.me/outfoxxed/quickshell"
},
@ -824,7 +822,7 @@
"hyprland": "hyprland",
"hyprland-dots": "hyprland-dots",
"nix-gaming": "nix-gaming",
"nixpkgs": "nixpkgs_6",
"nixpkgs": "nixpkgs_7",
"nvim-dots": "nvim-dots",
"pinix": "pinix",
"quickshell": "quickshell",
@ -848,16 +846,16 @@
},
"systems_2": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"lastModified": 1689347949,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"repo": "default-linux",
"rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"repo": "default-linux",
"type": "github"
}
},
@ -876,28 +874,13 @@
"type": "github"
}
},
"systems_4": {
"locked": {
"lastModified": 1689347949,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
"owner": "nix-systems",
"repo": "default-linux",
"rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default-linux",
"type": "github"
}
},
"unstable": {
"locked": {
"lastModified": 1761594641,
"narHash": "sha256-sImk6SJQASDLQo8l+0zWWaBgg7TueLS6lTvdH5pBZpo=",
"lastModified": 1763618868,
"narHash": "sha256-v5afmLjn/uyD9EQuPBn7nZuaZVV9r+JerayK/4wvdWA=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "1666250dbe4141e4ca8aaf89b40a3a51c2e36144",
"rev": "a8d610af3f1a5fb71e23e08434d8d61a466fc942",
"type": "github"
},
"original": {
@ -935,11 +918,11 @@
]
},
"locked": {
"lastModified": 1760713634,
"narHash": "sha256-5HXelmz2x/uO26lvW7MudnadbAfoBnve4tRBiDVLtOM=",
"lastModified": 1761431178,
"narHash": "sha256-xzjC1CV3+wpUQKNF+GnadnkeGUCJX+vgaWIZsnz9tzI=",
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
"rev": "753bbbdf6a052994da94062e5b753288cef28dfb",
"rev": "4b8801228ff958d028f588f0c2b911dbf32297f9",
"type": "github"
},
"original": {

View file

@ -5,13 +5,12 @@
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
home-manager = {
url = "github:nix-community/home-manager/release-25.05";
url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs";
};
nix-gaming = {
url = "github:fufexan/nix-gaming";
inputs.nixpkgs.follows = "nixpkgs";
};
unstable = {
@ -42,7 +41,6 @@
url = "github:AvengeMedia/DankMaterialShell";
inputs.nixpkgs.follows = "nixpkgs";
inputs.dgop.follows = "dgop";
inputs.dms-cli.follows = "dms-cli";
};
nvim-dots = {
@ -80,12 +78,6 @@
hyprland = {
url = "github:hyprwm/Hyprland";
};
# nvm didnt even end up working
# hyprspace = {
# url = "github:KZDKM/Hyprspace/";
# inputs.hyprland.follows = "hyprland";
#};
};
outputs = {
@ -96,7 +88,6 @@
unstable,
ghostty,
hu-tao-cursor,
dgop,
dms-cli,
dankMaterialShell,
pinix,
@ -138,14 +129,13 @@
hostPlatform = system;
overlays = [
(final: prev: {
rpcs3 = unstablePkgs.rpcs3;
quickshell = unstable.legacyPackages.${system}.quickshell;
ghostty = inputs.ghostty.packages.${system}.default;
hu-tao-animated-cursor = inputs.hu-tao-cursor.packages.${system}.default;
grim-hyprland = inputs.grim-hyprland.packages.${system}.default;
dgop = inputs.dgop.packages.${system}.default;
dms-cli = inputs.dms-cli.packages.${system}.default;
DMShell = inputs.dankMaterialShell.packages.${system}.default;
dmsCli = inputs.dankMaterialShell.packages.${system}.default;
dankMaterialShell = inputs.dankMaterialShell.packages.${system}.dankMaterialShell;
pinix = inputs.pinix.packages.${system}.default;
})
(final: prev: {
@ -155,6 +145,7 @@
binary-font
minijinja-cli
thorium
rpcs3
;
})
@ -201,7 +192,6 @@
inherit
(customPkgs)
minijinja-cli
voicevox
;
})
(final: prev: {

View file

@ -25,10 +25,10 @@
./modules/mpv.nix
./modules/ani-cli.nix
./modules/quickshell.nix
#./modules/hyprspace.nix
./modules/cava.nix
./modules/rgb.nix
./modules/anyrun.nix
./modules/imagemagick.nix
inputs.dankMaterialShell.homeModules.dankMaterialShell.default
];
home.username = "${config.theme.user}";
@ -40,8 +40,6 @@
# TODO: move these somewhere else; undecided
home.packages = with pkgs; [
btop
nvtopPackages.full
kdePackages.dolphin
voicevox
];

View file

@ -11,11 +11,12 @@
umask 022
repo=${lib.escapeShellArg hyprlanddots}
nvimrepo=${lib.escapeShellArg nvimDotfiles}
dmsConfig="${pkgs.dankMaterialShell}/etc/xdg/quickshell/dms"
mkdir -p "${config.xdg.configHome}"
copy_dir() {
src="$1"; dest="$2"
src="$1"; dest="$2"; skip="''${3:-true}"
[ -d "$src" ] || return 0
[ -e "$dest" ] && return 0
[ "$skip" = "true" ] && [ -e "$dest" ] && return 0
mkdir -p "$dest"
if [ -x ${pkgs.rsync}/bin/rsync ]; then
${pkgs.rsync}/bin/rsync -rlD \
@ -26,12 +27,11 @@
fi
chmod -R u+rwX "$dest"
}
copy_dir "$repo/fish" "${config.xdg.configHome}/fish"
copy_dir "$repo/hypr" "${config.xdg.configHome}/hypr"
copy_dir "$repo/cava" "${config.xdg.configHome}/cava"
copy_dir "$nvimrepo" "${config.xdg.configHome}/nvim"
copy_dir "$dmsConfig" "${config.xdg.configHome}/quickshell" "false"
if [ -f "$repo/starship.toml" ] && [ ! -e "${config.xdg.configHome}/starship.toml" ]; then
install -Dm0644 "$repo/starship.toml" "${config.xdg.configHome}/starship.toml"
fi

View file

@ -1,5 +1,6 @@
{pkgs, ...}: {
home.packages = with pkgs; [
vesktop
discord
];
}

View file

@ -2,11 +2,13 @@
home.packages = with pkgs; [
fish
fzf
ripgrep
bat
eza
fd
ugrep
yazi
chafa
btop
nvtopPackages.full
];
}

View file

@ -0,0 +1,5 @@
{pkgs, ...}: {
home.packages = with pkgs; [
godot
];
}

View file

@ -0,0 +1,6 @@
{pkgs, ...}:
{
home.packages = with pkgs; [
imagemagick
];
}

View file

@ -6,8 +6,7 @@
}: {
home.packages = with pkgs; [
quickshell
DMShell
dms-cli
dmsCli
dgop
ddcutil
cliphist

View file

@ -1,7 +1,7 @@
{pkgs, ...}: {
environment.systemPackages = with pkgs; [
busybox # in case im missing something random
fd
unzip
jq
wrk
bitwarden
@ -20,7 +20,6 @@
nasm
nix-prefetch-git
icu
libclang
argc
clang
openssl

View file

@ -2,6 +2,7 @@
lib,
config,
pkgs,
inputs,
...
}: {
services.xserver.enable = false;
@ -13,10 +14,16 @@
xdg.portal = {
enable = true;
extraPortals = with pkgs; [xdg-desktop-portal-hyprland xdg-desktop-portal-gtk];
extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
config = {
common.default = ["gtk"];
hyprland.default = ["hyprland" "gtk"];
common = {
default = [ "gtk" ];
};
hyprland = {
default = [ "gtk" ];
"org.freedesktop.impl.portal.ScreenCast" = [ "hyprland" ];
"org.freedesktop.impl.portal.Screenshot" = [ "hyprland" ];
};
};
};

View file

@ -1,5 +1,6 @@
{pkgs, ...}: {
environment.systemPackages = with pkgs; [
libclang
texlive.combined.scheme-full
poppler_utils
libnotify

View file

@ -7,4 +7,5 @@
minijinja-cli = pkgs.callPackage ./minijinja-cli {};
thorium = pkgs.callPackage ./thorium {};
voicevox = pkgs.callPackage ./voicevox {};
rpcs3 = pkgs.callPackage ./rpcs3 {};
}

11
pkgs/rpcs3/default.nix Normal file
View file

@ -0,0 +1,11 @@
{
pkgs,
lib,
}:
pkgs.rpcs3.overrideAttrs (oldAttrs: {
cmakeFlags =
(oldAttrs.cmakeFlags or [])
++ [
"-DUSE_DISCORD_RPC=ON"
];
})

View file

@ -109,23 +109,28 @@ stdenvNoCC.mkDerivation rec {
installPhase = ''
runHook preInstall
mkdir -p $out/{opt/thorium,bin,share/{applications,icons/hicolor/256x256/apps}}
mkdir -p $out/{opt/thorium,bin,share/applications}
cp -r $(find opt -type d -name thorium | head -1)/* $out/opt/thorium/
rm -f $out/opt/thorium/libqt{5,6}_shim.so
ln -sf $out/opt/thorium/thorium $out/bin/thorium
ln -sf $out/bin/thorium $out/bin/thorium-browser
if [ -f usr/share/applications/thorium*.desktop ]; then
if [ -f usr/share/applications/thorium-browser.desktop ]; then
sed -E \
-e "s|^Exec=.*|Exec=$out/bin/thorium %U|" \
-e "s|^Icon=.*|Icon=thorium|" \
usr/share/applications/thorium*.desktop > $out/share/applications/thorium.desktop
usr/share/applications/thorium-browser.desktop > $out/share/applications/thorium.desktop
fi
[ -d usr/share/icons ] && cp -r usr/share/icons/* $out/share/icons/ || true
[ -d usr/share/pixmaps ] && cp -r usr/share/pixmaps/* $out/share/icons/ || true
if [ -d usr/share/icons ]; then
cp -r usr/share/icons $out/share/
fi
if [ ! -d $out/share/icons/hicolor ]; then
mkdir -p $out/share/icons/hicolor/{48x48,128x128,256x256}/apps
if [ -f $out/opt/thorium/product_logo_256.png ]; then
cp $out/opt/thorium/product_logo_256.png $out/share/icons/hicolor/256x256/apps/thorium.png
cp $out/opt/thorium/product_logo_256.png $out/share/icons/hicolor/256x256/apps/thorium-browser.png
elif [ -f $out/opt/thorium/product_logo_128.png ]; then
cp $out/opt/thorium/product_logo_128.png $out/share/icons/hicolor/128x128/apps/thorium-browser.png
elif [ -f $out/opt/thorium/thorium.png ]; then
cp $out/opt/thorium/thorium.png $out/share/icons/hicolor/256x256/apps/thorium.png
cp $out/opt/thorium/thorium.png $out/share/icons/hicolor/256x256/apps/thorium-browser.png
fi
fi
runHook postInstall
'';