This commit is contained in:
Kat Inskip 2023-11-05 18:59:14 -08:00
parent 84ec8cbec6
commit 0822d1162d
Signed by: kat
GPG key ID: 465E64DECEA8CF0F
8 changed files with 84 additions and 46 deletions

96
flake.lock generated
View file

@ -3,11 +3,11 @@
"arcexprs": { "arcexprs": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1694822850, "lastModified": 1698348243,
"narHash": "sha256-GWmZ25E0k4AE+f8VwLQkSEu/Sq1WYwhlslSIpQQvMTU=", "narHash": "sha256-SxjAhKlPel0urPAbY0JBjW1qmxSNdwvBXxvHdAM18YM=",
"owner": "arcnmx", "owner": "arcnmx",
"repo": "nixexprs", "repo": "nixexprs",
"rev": "cea284611c93214b6e1117b89463ccb785b3692d", "rev": "73fac7b2a61463027d6980cc95401b6f3903cbe2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -79,11 +79,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1695114819, "lastModified": 1698429334,
"narHash": "sha256-/aIfbZxP39QZ8m7qX2RzQTy5PWzz2e22cCcZ+AOO7lA=", "narHash": "sha256-Gq3+QabboczSu7RMpcy79RSLMSqnySO3wsnHQk4DfbE=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "afeddc412b3a3b0e7c9ef7ea5fbdf2186781d102", "rev": "afe83cbc2e673b1f08d32dd0f70df599678ff1e7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -106,11 +106,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1695052866, "lastModified": 1698921442,
"narHash": "sha256-agn7F9Oww4oU6nPiw+YiYI9Xb4vOOE73w8PAoBRP4AA=", "narHash": "sha256-7KmvhQ7FuXlT/wG4zjTssap6maVqeAMBdtel+VjClSM=",
"owner": "serokell", "owner": "serokell",
"repo": "deploy-rs", "repo": "deploy-rs",
"rev": "e3f41832680801d0ee9e2ed33eb63af398b090e9", "rev": "660180bbbeae7d60dad5a92b30858306945fd427",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -138,11 +138,11 @@
"flake-compat": { "flake-compat": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1673956053, "lastModified": 1696426674,
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "edolstra", "owner": "edolstra",
"repo": "flake-compat", "repo": "flake-compat",
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -194,11 +194,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1695224363, "lastModified": 1699025595,
"narHash": "sha256-+hfjJLUMck5G92RVFDZA7LWkR3kOxs5zQ7RPW9t3eM8=", "narHash": "sha256-e+o4PoSu2Z6Ww8y/AVUmMU200rNZoRK+p2opQ7Db8Rg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "408ba13188ff9ce309fa2bdd2f81287d79773b00", "rev": "8765d4e38aa0be53cdeee26f7386173e6c65618d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -271,11 +271,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1695086253, "lastModified": 1699060567,
"narHash": "sha256-xKaB3ZjmsJ4e+/lsUHsdGnjcM+j2ow6SW/nERX/E4r0=", "narHash": "sha256-L+aIEqyK+jm81NZMYWBhRe6EHJFNjdUG53FfN7Zr06g=",
"owner": "Infinidoge", "owner": "Infinidoge",
"repo": "nix-minecraft", "repo": "nix-minecraft",
"rev": "198ed5822fcb6f25c1a3d8bf63f50f65da889220", "rev": "7a899a5b6c9841815389e1a162d3515b18a78624",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -335,11 +335,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1694921880, "lastModified": 1698550809,
"narHash": "sha256-yU36cs5UdzhTwsM9bUWUz43N//ELzQ1ro69C07pU/8E=", "narHash": "sha256-Um8+Wi6EAH5dCgfgl7OqaVd4wFJn6FKLafcP5QPr/98=",
"owner": "Mic92", "owner": "Mic92",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "9d2bcc47110b3b6217dfebd6761ba20bc78aedf2", "rev": "1f0981f5baeb78e3c89a8980ff1a39f06876fa8c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -350,11 +350,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1695109627, "lastModified": 1699044561,
"narHash": "sha256-4rpyoVzmunIG6xWA/EonnSSqC69bDBzciFi6SjBze/0=", "narHash": "sha256-3uHmbq74CicpBPP40a6NHp830S7Rvh33uFgfIIC+7nw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "cb4dc98f776ddb6af165e6f06b2902efe31ca67a", "rev": "87f8403371fa74d9ad21ed677403cc235f37b96c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -379,11 +379,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1694908564, "lastModified": 1698544399,
"narHash": "sha256-ducA98AuWWJu5oUElIzN24Q22WlO8bOfixGzBgzYdVc=", "narHash": "sha256-vhRmPyEyoPkrXF2iykBsWHA05MIaOSmMRLMF7Hul6+s=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "596611941a74be176b98aeba9328aa9d01b8b322", "rev": "d87c5d8c41c9b3b39592563242f3a448b5cc4bc9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -395,11 +395,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1695145219, "lastModified": 1698924604,
"narHash": "sha256-Eoe9IHbvmo5wEDeJXKFOpKUwxYJIOxKUesounVccNYk=", "narHash": "sha256-GCFbkl2tj8fEZBZCw3Tc0AkGo0v+YrQlohhEGJ/X4s0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5ba549eafcf3e33405e5f66decd1a72356632b96", "rev": "fa804edfb7869c9fb230e174182a8a1a7e512c40",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -409,6 +409,29 @@
"type": "github" "type": "github"
} }
}, },
"plasma-manager": {
"inputs": {
"home-manager": [
"home-manager"
],
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1690827734,
"narHash": "sha256-zcNLTSKGZ5zcx0RQkDKH4dN2MBx+KTfrYN7HfmD0N7c=",
"owner": "pjones",
"repo": "plasma-manager",
"rev": "b6241a2f7c625d0b0bee8e203d78232d0a6535e9",
"type": "github"
},
"original": {
"owner": "pjones",
"repo": "plasma-manager",
"type": "github"
}
},
"poetry2nix": { "poetry2nix": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
@ -487,6 +510,7 @@
"nix-index-database": "nix-index-database", "nix-index-database": "nix-index-database",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"plasma-manager": "plasma-manager",
"pypi-deps-db": "pypi-deps-db", "pypi-deps-db": "pypi-deps-db",
"scalpel": "scalpel", "scalpel": "scalpel",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
@ -546,11 +570,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1695284550, "lastModified": 1699021419,
"narHash": "sha256-z9fz/wz9qo9XePEvdduf+sBNeoI9QG8NJKl5ssA8Xl4=", "narHash": "sha256-oy2j2OHXYcckifASMeZzpmbDLSvobMGt0V/RvoDotF4=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "2f375ed8702b0d8ee2430885059d5e7975e38f78", "rev": "275b28593ef3a1b9d05b6eeda3ddce2f45f5c06f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -697,11 +721,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1694522206, "lastModified": 1698222534,
"narHash": "sha256-mb34WlyHi/whE6gIMEtXKfGRALzvB6/U7CYdUnJKN+c=", "narHash": "sha256-iF9C7C7eT8LVVWx5IOZ/8KKJT8AIw9A5aBA6vqS18l8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NixOS-WSL", "repo": "NixOS-WSL",
"rev": "e7d93d0f478b6fbb47c00d03449dc3d08b90abb7", "rev": "a058cff4b09b3a398d8caa379b4dc96cfedd98c9",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -118,6 +118,15 @@
url = "github:arcnmx/nixexprs/master"; url = "github:arcnmx/nixexprs/master";
flake = false; flake = false;
}; };
# plasma manager
plasma-manager = {
url = "github:pjones/plasma-manager";
inputs = {
nixpkgs.follows = "nixpkgs";
home-manager.follows = "home-manager";
};
};
# work
artemiscore = { artemiscore = {
url = "git+ssh://git@github.com/Glamorous-ai/metaflow-core-plugin.git?ref=develop"; url = "git+ssh://git@github.com/Glamorous-ai/metaflow-core-plugin.git?ref=develop";
inputs = { inputs = {

View file

@ -106,7 +106,7 @@ in {
term-osd-bar = true; term-osd-bar = true;
script-opts = script-opts =
string.concatSep "," string.concatSep ","
(mapToValues (k: v: "${k}=${toString v}") { (set.mapToValues (k: v: "${k}=${toString v}") {
ytdl_hook-ytdl_path = "${pkgs.yt-dlp}/bin/yt-dlp"; ytdl_hook-ytdl_path = "${pkgs.yt-dlp}/bin/yt-dlp";
osc-layout = "slimbox"; osc-layout = "slimbox";
osc-vidscale = "no"; osc-vidscale = "no";

View file

@ -18,10 +18,6 @@
tdesktop # Telegram tdesktop # Telegram
dino # XMPP dino # XMPP
signal-desktop signal-desktop
mumble-develop
# IDEs
jetbrains.idea-community
jetbrains.pycharm-community
# Exocortex # Exocortex
obsidian obsidian
# Archivery # Archivery

10
nixos/roles/kde/kde.nix Normal file
View file

@ -0,0 +1,10 @@
{tree, ...}: {
imports = with tree.nixos.roles; [
graphical
];
services.xserver.enable = true;
services.xserver.displayManager.sddm.enable = true;
services.xserver.desktopManager.plasma5.enable = true;
programs.dconf.enable = true;
}

View file

@ -14,12 +14,11 @@ _: let
sound sound
] ]
++ (with tree.nixos.roles; [ ++ (with tree.nixos.roles; [
gnome kde
gaming gaming
]) ])
++ (with tree.kat; [ ++ (with tree.kat; [
gui gui
gnome
]); ]);
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [

View file

@ -11,13 +11,12 @@ _: let
] ]
++ (with tree.nixos.roles; [ ++ (with tree.nixos.roles; [
graphical graphical
gnome kde
laptop laptop
]) ])
++ (with tree; [ ++ (with tree; [
kat.gui kat.gui
kat.gnome kat.vscode
kat.vscodium
]); ]);
fileSystems = { fileSystems = {

View file

@ -86,6 +86,7 @@
[ [
nix-index-database.hmModules.nix-index nix-index-database.hmModules.nix-index
konawall-rs.hmModules.konawall konawall-rs.hmModules.konawall
plasma-manager.homeManagerModules.plasma-manager
] ]
++ (with (import (inputs.arcexprs + "/modules")).home-manager; [ ++ (with (import (inputs.arcexprs + "/modules")).home-manager; [
base16 base16