Compare commits
No commits in common. "fefc9ffed936f80d1760d2c81d1a789cf4415cac" and "864167a091771823cd36eed31b6b68bb6d863e54" have entirely different histories.
fefc9ffed9
...
864167a091
14 changed files with 218 additions and 228 deletions
157
flake.lock
generated
157
flake.lock
generated
|
|
@ -6,11 +6,11 @@
|
|||
"nixpkgs": "nixpkgs"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1772952158,
|
||||
"narHash": "sha256-RDR+7v1vaojweHI3FdPnuYPy4wRGfTKgeD5GXrXbfT0=",
|
||||
"lastModified": 1771511514,
|
||||
"narHash": "sha256-qhtonMK07BCVC/wZ+pZ9/MKhcTric7YUaCpW6pOg8IM=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixos-apple-silicon",
|
||||
"rev": "55b7c3c03e9b778d96a71f44400bbdda9a4cfda7",
|
||||
"rev": "2b92d495204be0b10845c66361444dbc8441c68d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -39,11 +39,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1772292445,
|
||||
"narHash": "sha256-4F1Q7U313TKUDDovCC96m/Za4wZcJ3yqtu4eSrj8lk8=",
|
||||
"lastModified": 1771610171,
|
||||
"narHash": "sha256-+DeInuhbm6a6PpHDNUS7pozDouq2+8xSDefoNaZLW0E=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "aquamarine",
|
||||
"rev": "1dbbba659c1cef0b0202ce92cadfe13bae550e8f",
|
||||
"rev": "7f9eb087703ec4acc6b288d02fa9ea3db803cd3d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -70,14 +70,30 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"base16-discord": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1768273180,
|
||||
"narHash": "sha256-uw7lz53YHxvPEyXZiS+NJFhKMb6AMUvVpCLH81NjM7U=",
|
||||
"owner": "imbypass",
|
||||
"repo": "base16-discord",
|
||||
"rev": "d4df17db31276d94cc1a8988f34e813aae1f3fb4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "imbypass",
|
||||
"repo": "base16-discord",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"cachyos-kernel": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1772644657,
|
||||
"narHash": "sha256-7zQSBFv9gFeYhe65NchqLLste7mJ396jA1OnNcf+OQQ=",
|
||||
"lastModified": 1771517207,
|
||||
"narHash": "sha256-+zDtnmXNyMd3hMepErdPDZzqYS0PiZA0Anbbx9Pvs4g=",
|
||||
"owner": "CachyOS",
|
||||
"repo": "linux-cachyos",
|
||||
"rev": "ff5ccc4fa26d5272d929fb9c1838593a6347ca10",
|
||||
"rev": "39737576a25091a3c4ca00729b769a1f92ec98d5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -89,11 +105,11 @@
|
|||
"cachyos-kernel-patches": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1772731186,
|
||||
"narHash": "sha256-y70pS9Cma7+WCsni3VTacHh9g/udulmBS6zrYE2Fz64=",
|
||||
"lastModified": 1771516433,
|
||||
"narHash": "sha256-SuockPZgd2bfjWGmdT8AUBTnBZWvxdA+b8Ss98lNC6c=",
|
||||
"owner": "CachyOS",
|
||||
"repo": "kernel-patches",
|
||||
"rev": "eac8168ee15f742547d4d20ba5c7fea283f23019",
|
||||
"rev": "505aef2086e584ba683a5ac1cb8ed8252fea2cfd",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -154,11 +170,11 @@
|
|||
"nixpkgs-lib": "nixpkgs-lib"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1772408722,
|
||||
"narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=",
|
||||
"lastModified": 1769996383,
|
||||
"narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3",
|
||||
"rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -175,11 +191,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1769996383,
|
||||
"narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
|
||||
"lastModified": 1768135262,
|
||||
"narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
|
||||
"rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -254,11 +270,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1773093840,
|
||||
"narHash": "sha256-u/96NoAyN8BSRuM3ZimGf7vyYgXa3pLx4MYWjokuoH4=",
|
||||
"lastModified": 1769579508,
|
||||
"narHash": "sha256-EE2bs7xFrC64qrj0N2zP6E6e/nmhcdw6v/grdYi+BiY=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "bb014746edb2a98d975abde4dd40fa240de4cf86",
|
||||
"rev": "eec72f127831326b042d1f35003767a4ab6a9516",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -344,11 +360,11 @@
|
|||
"xdph": "xdph"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1773082851,
|
||||
"narHash": "sha256-xeeeJ1gt4SoskgHW67PVX5p7cDlZFSyX5n4eUSPjxT8=",
|
||||
"lastModified": 1772297734,
|
||||
"narHash": "sha256-ASoB8+3t/DNKWv2LCEDjUP+tV2+Mi6Lzi5lryXGN2B0=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "Hyprland",
|
||||
"rev": "e32eeb1d454b029a24ca71f410896bf52839085d",
|
||||
"rev": "1c64ef06d9cb555fc562345c172c45e95c3b3077",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -621,11 +637,11 @@
|
|||
"niri-blur": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1772873838,
|
||||
"narHash": "sha256-pFh7J2fBqsZvZrD26zfOj30qTM8+7PLZsNSLX+VOcUA=",
|
||||
"lastModified": 1772514470,
|
||||
"narHash": "sha256-nSrfHwbjg8/Rfx5pqDqU8bL5IWh99MsvxfjNZYxqEFw=",
|
||||
"owner": "niri-wm",
|
||||
"repo": "niri",
|
||||
"rev": "5393902dd22e9d540438ee178775f1e488eea724",
|
||||
"rev": "c837d944f0cc08580ee86574dd0c3a68ca9379a4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -661,11 +677,11 @@
|
|||
"nixpkgs": "nixpkgs_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1772992385,
|
||||
"narHash": "sha256-nHFrO9rNXV4p28SPkVcaVM8wds9s6ouivnMELo4fXms=",
|
||||
"lastModified": 1771525883,
|
||||
"narHash": "sha256-XqDuaRbxLGno5HcWRE5lQrgMBeXXs6ncGq+R6eCvsq8=",
|
||||
"owner": "xddxdd",
|
||||
"repo": "nix-cachyos-kernel",
|
||||
"rev": "c7fac23ec3da662ca8e2fac8ba60076d5e06c6b1",
|
||||
"rev": "15fb6039dd248d478a8f3f7f6c067b206da2bf54",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -693,11 +709,11 @@
|
|||
},
|
||||
"nixpkgs-lib": {
|
||||
"locked": {
|
||||
"lastModified": 1772328832,
|
||||
"narHash": "sha256-e+/T/pmEkLP6BHhYjx6GmwP5ivonQQn0bJdH9YrRB+Q=",
|
||||
"lastModified": 1769909678,
|
||||
"narHash": "sha256-cBEymOf4/o3FD5AZnzC3J9hLbiZ+QDT/KDuyHXVJOpM=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixpkgs.lib",
|
||||
"rev": "c185c7a5e5dd8f9add5b2f8ebeff00888b070742",
|
||||
"rev": "72716169fe93074c333e8d0173151350670b824c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -708,11 +724,11 @@
|
|||
},
|
||||
"nixpkgs-stable": {
|
||||
"locked": {
|
||||
"lastModified": 1772822230,
|
||||
"narHash": "sha256-yf3iYLGbGVlIthlQIk5/4/EQDZNNEmuqKZkQssMljuw=",
|
||||
"lastModified": 1769598131,
|
||||
"narHash": "sha256-e7VO/kGLgRMbWtpBqdWl0uFg8Y2XWFMdz0uUJvlML8o=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "71caefce12ba78d84fe618cf61644dce01cf3a96",
|
||||
"rev": "fa83fd837f3098e3e678e6cf017b2b36102c7211",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -724,11 +740,11 @@
|
|||
},
|
||||
"nixpkgs-unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1772963539,
|
||||
"narHash": "sha256-9jVDGZnvCckTGdYT53d/EfznygLskyLQXYwJLKMPsZs=",
|
||||
"lastModified": 1769461804,
|
||||
"narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "9dcb002ca1690658be4a04645215baea8b95f31d",
|
||||
"rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -740,11 +756,11 @@
|
|||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1772963539,
|
||||
"narHash": "sha256-9jVDGZnvCckTGdYT53d/EfznygLskyLQXYwJLKMPsZs=",
|
||||
"lastModified": 1771482645,
|
||||
"narHash": "sha256-MpAKyXfJRDTgRU33Hja+G+3h9ywLAJJNRq4Pjbb4dQs=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "9dcb002ca1690658be4a04645215baea8b95f31d",
|
||||
"rev": "724cf38d99ba81fbb4a347081db93e2e3a9bc2ae",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -763,11 +779,11 @@
|
|||
"systems": "systems_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1772402258,
|
||||
"narHash": "sha256-3DmCFOdmbkFML1/G9gj8Wb+rCCZFPOQtNoMCpqOF8SA=",
|
||||
"lastModified": 1769537308,
|
||||
"narHash": "sha256-N7famD4s2hiDIicr9mJWhUj8l9EULB60+1QN/S+UjeM=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixvim",
|
||||
"rev": "21ae25e13b01d3b4cdc750b5f9e7bad68b150c10",
|
||||
"rev": "7addac6d111837217c16762968a9042eac703f7e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -780,41 +796,19 @@
|
|||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"noctalia-qs": "noctalia-qs"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1773090974,
|
||||
"narHash": "sha256-D9dpV+/TMVLO34Q/cZADB68OvmDbFt+9ydxyXpFEVjY=",
|
||||
"owner": "noctalia-dev",
|
||||
"repo": "noctalia-shell",
|
||||
"rev": "44045fa02045300304b9d1cb0d6c0a9988fc4772",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "noctalia-dev",
|
||||
"repo": "noctalia-shell",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"noctalia-qs": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"noctalia",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1772673824,
|
||||
"narHash": "sha256-TLHXPoELZA6VeuzC1Zpx+MnSsYzrJs+DSieMgfjAOJc=",
|
||||
"lastModified": 1769607092,
|
||||
"narHash": "sha256-P0KGVjKtN+hkZWskpxr2iXWalPb0SKAgRVyMFZxdxf0=",
|
||||
"owner": "noctalia-dev",
|
||||
"repo": "noctalia-qs",
|
||||
"rev": "f8531192cd09b9ea2e78d18e9cfc9d3dba498690",
|
||||
"repo": "noctalia-shell",
|
||||
"rev": "b2b16ecdda1bc04001a7c714bf8124160a86ddfc",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "noctalia-dev",
|
||||
"repo": "noctalia-qs",
|
||||
"repo": "noctalia-shell",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
|
|
@ -826,11 +820,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1773104692,
|
||||
"narHash": "sha256-Knyv6e1o+W2fqJ/S9dDJxTpOMmnZi6OgN0vdx6tf9Uw=",
|
||||
"lastModified": 1769604042,
|
||||
"narHash": "sha256-KQGbmKSY3tA4S8qFN76xd+3cbM0mAtPgoUVbjWrprcs=",
|
||||
"owner": "nix-community",
|
||||
"repo": "NUR",
|
||||
"rev": "ed329bf1d83aa3cb2cd5151a4e6fbe7f9fee9ec2",
|
||||
"rev": "92f5f3f18a365341dd424314a80253f5ede071e4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -866,11 +860,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1772361940,
|
||||
"narHash": "sha256-B1Cz+ydL1iaOnGlwOFld/C8lBECPtzhiy/pP93/CuyY=",
|
||||
"lastModified": 1767662275,
|
||||
"narHash": "sha256-d5Q1GmQ+sW1Bt8cgDE0vOihzLaswsm8cSdg8124EqXE=",
|
||||
"owner": "nix-community",
|
||||
"repo": "plasma-manager",
|
||||
"rev": "a4b33606111c9c5dcd10009042bb710307174f51",
|
||||
"rev": "51816be33a1ff0d4b22427de83222d5bfa96d30e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -889,11 +883,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1772024342,
|
||||
"narHash": "sha256-+eXlIc4/7dE6EcPs9a2DaSY3fTA9AE526hGqkNID3Wg=",
|
||||
"lastModified": 1771858127,
|
||||
"narHash": "sha256-Gtre9YoYl3n25tJH2AoSdjuwcqij5CPxL3U3xysYD08=",
|
||||
"owner": "cachix",
|
||||
"repo": "git-hooks.nix",
|
||||
"rev": "6e34e97ed9788b17796ee43ccdbaf871a5c2b476",
|
||||
"rev": "49bbbfc218bf3856dfa631cead3b052d78248b83",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -906,6 +900,7 @@
|
|||
"inputs": {
|
||||
"apple-silicon": "apple-silicon",
|
||||
"base16": "base16",
|
||||
"base16-discord": "base16-discord",
|
||||
"home-manager": "home-manager",
|
||||
"hyprland": "hyprland",
|
||||
"niri": "niri",
|
||||
|
|
|
|||
|
|
@ -17,6 +17,11 @@
|
|||
flake = false;
|
||||
};
|
||||
|
||||
base16-discord = {
|
||||
url = "github:imbypass/base16-discord";
|
||||
flake = false;
|
||||
};
|
||||
|
||||
home-manager = {
|
||||
url = "github:nix-community/home-manager";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
|
@ -74,6 +79,7 @@
|
|||
apple-silicon,
|
||||
base16,
|
||||
tt-schemes,
|
||||
base16-discord,
|
||||
home-manager,
|
||||
plasma-manager,
|
||||
niri,
|
||||
|
|
@ -126,6 +132,7 @@
|
|||
nur.overlays.default
|
||||
(final: prev: {
|
||||
openmw-git = openmw;
|
||||
base16-discord-git = base16-discord;
|
||||
})
|
||||
(import ./packages/overlay.nix)
|
||||
];
|
||||
|
|
@ -176,7 +183,6 @@
|
|||
"wheel"
|
||||
"networkmanager"
|
||||
"podman"
|
||||
"pipewire"
|
||||
];
|
||||
hashedPassword = "$6$bvwRUFaJNMpH8rm3$FGDWFN6tBScJ/2DynAjnlZE8JRfyADN78d6c4GawxpAjyNLNE/AjQzMA09tLRqpKX7WnN5PIUZLAm2bT9/RbG0";
|
||||
openssh.authorizedKeys.keys = [
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@
|
|||
input-leap
|
||||
libreoffice-qt-fresh
|
||||
# nur.repos.forkprince.helium-nightly
|
||||
chromium
|
||||
nautilus
|
||||
fractal
|
||||
tuba
|
||||
|
|
@ -28,8 +29,8 @@
|
|||
spotify-player
|
||||
|
||||
# overrides
|
||||
(chromium.override {
|
||||
enableWideVine = true;
|
||||
})
|
||||
# (chromium.override {
|
||||
# enableWideVine = true;
|
||||
# })
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,8 +4,9 @@
|
|||
...
|
||||
}:
|
||||
let
|
||||
mergedThemes = pkgs.runCommand "discordThemeDir" { } ''
|
||||
mergedThemes = pkgs.runCommand "mergedConfig" { } ''
|
||||
mkdir -p $out
|
||||
cp -rvf ${pkgs.base16-discord-git}/base16.css $out/base16.css
|
||||
'';
|
||||
|
||||
vesktopSettings = {
|
||||
|
|
|
|||
|
|
@ -4,105 +4,107 @@
|
|||
...
|
||||
}:
|
||||
let
|
||||
btop-colors = with config.scheme.withHashtag; ''
|
||||
# Credit to https://github.com/catppuccin/btop
|
||||
# Main background, empty for terminal default, need to be empty if you want transparent background
|
||||
theme[main_bg]="${base00}"
|
||||
|
||||
# Main text color
|
||||
theme[main_fg]="${base05}"
|
||||
|
||||
# Title color for boxes
|
||||
theme[title]="${base05}"
|
||||
|
||||
# Highlight color for keyboard shortcuts
|
||||
theme[hi_fg]="${base0D}"
|
||||
|
||||
# Background color of selected item in processes box
|
||||
theme[selected_bg]="${base02}"
|
||||
|
||||
# Foreground color of selected item in processes box
|
||||
theme[selected_fg]="${base0D}"
|
||||
|
||||
# Color of inactive/disabled text
|
||||
theme[inactive_fg]="${base03}"
|
||||
|
||||
# Color of text appearing on top of graphs, i.e uptime and current network graph scaling
|
||||
theme[graph_text]="${base06}"
|
||||
|
||||
# Background color of the percentage meters
|
||||
theme[meter_bg]="${base02}"
|
||||
|
||||
# Misc colors for processes box including mini cpu graphs, details memory graph and details status text
|
||||
theme[proc_misc]="${base06}"
|
||||
|
||||
# CPU, Memory, Network, Proc box outline colors
|
||||
theme[cpu_box]="${base0E}" #Mauve
|
||||
theme[mem_box]="${base0B}" #Green
|
||||
theme[net_box]="${base12}" #Maroon
|
||||
theme[proc_box]="${base0D}" #Blue
|
||||
|
||||
# Box divider line and small boxes line color
|
||||
theme[div_line]="${base03}"
|
||||
|
||||
# Temperature graph color (Green -> Yellow -> Red)
|
||||
theme[temp_start]="${base0B}"
|
||||
theme[temp_mid]="${base0A}"
|
||||
theme[temp_end]="${base08}"
|
||||
|
||||
# CPU graph colors (Teal -> Lavender)
|
||||
theme[cpu_start]="${base0C}"
|
||||
theme[cpu_mid]="${base16}"
|
||||
theme[cpu_end]="${base07}"
|
||||
|
||||
# Mem/Disk free meter (Mauve -> Lavender -> Blue)
|
||||
theme[free_start]="${base0E}"
|
||||
theme[free_mid]="${base07}"
|
||||
theme[free_end]="${base0D}"
|
||||
|
||||
# Mem/Disk cached meter (Sapphire -> Lavender)
|
||||
theme[cached_start]="${base16}"
|
||||
theme[cached_mid]="${base0D}"
|
||||
theme[cached_end]="${base07}"
|
||||
|
||||
# Mem/Disk available meter (Peach -> Red)
|
||||
theme[available_start]="${base09}"
|
||||
theme[available_mid]="${base12}"
|
||||
theme[available_end]="${base08}"
|
||||
|
||||
# Mem/Disk used meter (Green -> Sky)
|
||||
theme[used_start]="${base0B}"
|
||||
theme[used_mid]="${base0C}"
|
||||
theme[used_end]="${base15}"
|
||||
|
||||
# Download graph colors (Peach -> Red)
|
||||
theme[download_start]="${base09}"
|
||||
theme[download_mid]="${base12}"
|
||||
theme[download_end]="${base08}"
|
||||
|
||||
# Upload graph colors (Green -> Sky)
|
||||
theme[upload_start]="${base0B}"
|
||||
theme[upload_mid]="${base0C}"
|
||||
theme[upload_end]="${base15}"
|
||||
|
||||
# Process box color gradient for threads, mem and cpu usage (Sapphire -> Mauve)
|
||||
theme[process_start]="${base16}"
|
||||
theme[process_mid]="${base07}"
|
||||
theme[process_end]="${base0E}"
|
||||
'';
|
||||
|
||||
btop-colors-file = pkgs.writeTextFile {
|
||||
name = "btop-colors";
|
||||
text = with config.scheme.withHashtag; ''
|
||||
# Credit to https://github.com/catppuccin/btop
|
||||
# Main background, empty for terminal default, need to be empty if you want transparent background
|
||||
theme[main_bg]="${base00}"
|
||||
|
||||
# Main text color
|
||||
theme[main_fg]="${base05}"
|
||||
|
||||
# Title color for boxes
|
||||
theme[title]="${base05}"
|
||||
|
||||
# Highlight color for keyboard shortcuts
|
||||
theme[hi_fg]="${base0D}"
|
||||
|
||||
# Background color of selected item in processes box
|
||||
theme[selected_bg]="${base02}"
|
||||
|
||||
# Foreground color of selected item in processes box
|
||||
theme[selected_fg]="${base0D}"
|
||||
|
||||
# Color of inactive/disabled text
|
||||
theme[inactive_fg]="${base03}"
|
||||
|
||||
# Color of text appearing on top of graphs, i.e uptime and current network graph scaling
|
||||
theme[graph_text]="${base06}"
|
||||
|
||||
# Background color of the percentage meters
|
||||
theme[meter_bg]="${base02}"
|
||||
|
||||
# Misc colors for processes box including mini cpu graphs, details memory graph and details status text
|
||||
theme[proc_misc]="${base06}"
|
||||
|
||||
# CPU, Memory, Network, Proc box outline colors
|
||||
theme[cpu_box]="${base0E}" #Mauve
|
||||
theme[mem_box]="${base0B}" #Green
|
||||
theme[net_box]="${base12}" #Maroon
|
||||
theme[proc_box]="${base0D}" #Blue
|
||||
|
||||
# Box divider line and small boxes line color
|
||||
theme[div_line]="${base03}"
|
||||
|
||||
# Temperature graph color (Green -> Yellow -> Red)
|
||||
theme[temp_start]="${base0B}"
|
||||
theme[temp_mid]="${base0A}"
|
||||
theme[temp_end]="${base08}"
|
||||
|
||||
# CPU graph colors (Teal -> Lavender)
|
||||
theme[cpu_start]="${base0C}"
|
||||
theme[cpu_mid]="${base16}"
|
||||
theme[cpu_end]="${base07}"
|
||||
|
||||
# Mem/Disk free meter (Mauve -> Lavender -> Blue)
|
||||
theme[free_start]="${base0E}"
|
||||
theme[free_mid]="${base07}"
|
||||
theme[free_end]="${base0D}"
|
||||
|
||||
# Mem/Disk cached meter (Sapphire -> Lavender)
|
||||
theme[cached_start]="${base16}"
|
||||
theme[cached_mid]="${base0D}"
|
||||
theme[cached_end]="${base07}"
|
||||
|
||||
# Mem/Disk available meter (Peach -> Red)
|
||||
theme[available_start]="${base09}"
|
||||
theme[available_mid]="${base12}"
|
||||
theme[available_end]="${base08}"
|
||||
|
||||
# Mem/Disk used meter (Green -> Sky)
|
||||
theme[used_start]="${base0B}"
|
||||
theme[used_mid]="${base0C}"
|
||||
theme[used_end]="${base15}"
|
||||
|
||||
# Download graph colors (Peach -> Red)
|
||||
theme[download_start]="${base09}"
|
||||
theme[download_mid]="${base12}"
|
||||
theme[download_end]="${base08}"
|
||||
|
||||
# Upload graph colors (Green -> Sky)
|
||||
theme[upload_start]="${base0B}"
|
||||
theme[upload_mid]="${base0C}"
|
||||
theme[upload_end]="${base15}"
|
||||
|
||||
# Process box color gradient for threads, mem and cpu usage (Sapphire -> Mauve)
|
||||
theme[process_start]="${base16}"
|
||||
theme[process_mid]="${base07}"
|
||||
theme[process_end]="${base0E}"
|
||||
'';
|
||||
text = btop-colors;
|
||||
destination = "/nixos.theme";
|
||||
};
|
||||
|
||||
batConfigDir = pkgs.runCommand "mergedConfig" { } ''
|
||||
mergedConfig = pkgs.runCommand "mergedConfig" { } ''
|
||||
mkdir -p $out/themes
|
||||
cp -r ${btop-colors-file}/nixos.theme $out/themes/nixos.theme
|
||||
'';
|
||||
in
|
||||
{
|
||||
home.file.".config/btop" = {
|
||||
source = batConfigDir;
|
||||
source = mergedConfig;
|
||||
recursive = true;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -28,9 +28,6 @@
|
|||
browsh
|
||||
mosh
|
||||
gh
|
||||
kdePackages.qttools
|
||||
eza
|
||||
pigz
|
||||
|
||||
# development & tooling
|
||||
jdk21_headless
|
||||
|
|
@ -45,37 +42,17 @@
|
|||
flaresolverr
|
||||
nerd-fonts.fira-mono
|
||||
ffmpeg-full
|
||||
|
||||
# formatters
|
||||
kdePackages.qtdeclarative
|
||||
prettier
|
||||
prettierd
|
||||
nixfmt
|
||||
stylua
|
||||
black
|
||||
clang-tools
|
||||
];
|
||||
|
||||
programs = {
|
||||
git = {
|
||||
enable = true;
|
||||
settings = {
|
||||
user = {
|
||||
name = config.userOptions.name;
|
||||
email = config.userOptions.email;
|
||||
};
|
||||
core.pager = "${pkgs.bat}/bin/bat";
|
||||
commit.gpgsign = true;
|
||||
programs.git = {
|
||||
enable = true;
|
||||
settings = {
|
||||
user = {
|
||||
name = config.userOptions.name;
|
||||
email = config.userOptions.email;
|
||||
};
|
||||
core.pager = "${pkgs.bat}/bin/bat";
|
||||
commit.gpgsign = true;
|
||||
};
|
||||
bat = {
|
||||
enable = true;
|
||||
config.style = "numbers,changes";
|
||||
};
|
||||
lazygit = {
|
||||
enable = true;
|
||||
enableFishIntegration = true;
|
||||
};
|
||||
lazysql.enable = true;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,9 +1,16 @@
|
|||
{
|
||||
pkgs,
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
{
|
||||
home.packages = with pkgs; [
|
||||
kdePackages.qttools
|
||||
eza
|
||||
pigz
|
||||
];
|
||||
|
||||
programs.fish = {
|
||||
enable = true;
|
||||
shellAliases = {
|
||||
|
|
|
|||
|
|
@ -128,5 +128,14 @@ in
|
|||
macos_titlebar_color = "system";
|
||||
};
|
||||
};
|
||||
bat = {
|
||||
enable = true;
|
||||
# config.theme = "Catppuccin ${config.catppuccinUpper.flavor}";
|
||||
};
|
||||
lazygit = {
|
||||
enable = true;
|
||||
enableFishIntegration = true;
|
||||
};
|
||||
lazysql.enable = true;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,6 +7,16 @@
|
|||
{
|
||||
home.sessionVariables.EDITOR = lib.mkForce "kitty nvim";
|
||||
|
||||
home.packages = with pkgs; [
|
||||
kdePackages.qtdeclarative
|
||||
prettier
|
||||
prettierd
|
||||
nixfmt
|
||||
stylua
|
||||
black
|
||||
clang-tools
|
||||
];
|
||||
|
||||
programs.nixvim = {
|
||||
enable = true;
|
||||
enablePrintInit = true;
|
||||
|
|
|
|||
|
|
@ -80,7 +80,7 @@ pkgs.stdenv.mkDerivation {
|
|||
echo "Rendering complete. Building XCursor theme..."
|
||||
|
||||
echo "4. Build the final cursors"
|
||||
ctgen configs/normal/x.build.toml -s ${cursorSizes} -p x11 -d "bitmaps/${themeName}" -n "${themeName}" -c "${themeName} cursors"
|
||||
ctgen configs/right/x.build.toml -s ${cursorSizes} -p x11 -d "bitmaps/${themeName}" -n "${themeName}" -c "${themeName} cursors"
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
|
@ -88,7 +88,7 @@ pkgs.stdenv.mkDerivation {
|
|||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -dm 0755 $out/share/icons
|
||||
mkdir -p $out/share/icons
|
||||
cp -r themes/${themeName} $out/share/icons/
|
||||
|
||||
runHook postInstall
|
||||
|
|
|
|||
|
|
@ -114,8 +114,6 @@
|
|||
printing.enable = true;
|
||||
pipewire = {
|
||||
enable = true;
|
||||
systemWide = true;
|
||||
wireplumber.enable = true;
|
||||
alsa.enable = true;
|
||||
alsa.support32Bit = true;
|
||||
pulse.enable = true;
|
||||
|
|
@ -166,6 +164,7 @@
|
|||
networking.firewall.enable = false;
|
||||
networking.networkmanager.enable = true;
|
||||
documentation.man.enable = true;
|
||||
documentation.man.generateCaches = false;
|
||||
hardware.graphics.enable = true;
|
||||
hardware.bluetooth.enable = true;
|
||||
time.timeZone = "America/New_York";
|
||||
|
|
|
|||
|
|
@ -81,16 +81,4 @@
|
|||
"L+ /var/lib/qemu/firmware - - - - ${pkgs.qemu}/share/qemu/firmware"
|
||||
"d /mnt/storage 0775 sckova users - -"
|
||||
];
|
||||
|
||||
services.factorio = {
|
||||
enable = true;
|
||||
openFirewall = true;
|
||||
requireUserVerification = false;
|
||||
lan = true;
|
||||
port = 25565;
|
||||
# bind = "[::]"; # support IPv6
|
||||
game-name = "kova's minecraft";
|
||||
game-password = "ThisIsASuperSecurePasswordThatNobodyWillGuess";
|
||||
admins = [ "sckova" ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
{
|
||||
pkgs,
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
|
|
@ -25,13 +26,6 @@ in
|
|||
}
|
||||
];
|
||||
|
||||
# environment.systemPackages = with pkgs; [
|
||||
# # note for wine support (should be done by 26.05 release):
|
||||
# # https://github.com/NixOS/nixpkgs/issues/412458
|
||||
# muvm
|
||||
# fex
|
||||
# ];
|
||||
|
||||
services.logind.settings.Login = {
|
||||
HandleSuspendKey = "ignore";
|
||||
HandlePowerKey = "lock";
|
||||
|
|
|
|||
|
|
@ -19,4 +19,5 @@
|
|||
alias edit "nvim"
|
||||
'';
|
||||
};
|
||||
documentation.man.generateCaches = false;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue