Compare commits

...

8 commits

14 changed files with 227 additions and 217 deletions

155
flake.lock generated
View file

@ -6,11 +6,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1771511514,
"narHash": "sha256-qhtonMK07BCVC/wZ+pZ9/MKhcTric7YUaCpW6pOg8IM=",
"lastModified": 1772952158,
"narHash": "sha256-RDR+7v1vaojweHI3FdPnuYPy4wRGfTKgeD5GXrXbfT0=",
"owner": "nix-community",
"repo": "nixos-apple-silicon",
"rev": "2b92d495204be0b10845c66361444dbc8441c68d",
"rev": "55b7c3c03e9b778d96a71f44400bbdda9a4cfda7",
"type": "github"
},
"original": {
@ -39,11 +39,11 @@
]
},
"locked": {
"lastModified": 1771610171,
"narHash": "sha256-+DeInuhbm6a6PpHDNUS7pozDouq2+8xSDefoNaZLW0E=",
"lastModified": 1772292445,
"narHash": "sha256-4F1Q7U313TKUDDovCC96m/Za4wZcJ3yqtu4eSrj8lk8=",
"owner": "hyprwm",
"repo": "aquamarine",
"rev": "7f9eb087703ec4acc6b288d02fa9ea3db803cd3d",
"rev": "1dbbba659c1cef0b0202ce92cadfe13bae550e8f",
"type": "github"
},
"original": {
@ -70,30 +70,14 @@
"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": 1771517207,
"narHash": "sha256-+zDtnmXNyMd3hMepErdPDZzqYS0PiZA0Anbbx9Pvs4g=",
"lastModified": 1772644657,
"narHash": "sha256-7zQSBFv9gFeYhe65NchqLLste7mJ396jA1OnNcf+OQQ=",
"owner": "CachyOS",
"repo": "linux-cachyos",
"rev": "39737576a25091a3c4ca00729b769a1f92ec98d5",
"rev": "ff5ccc4fa26d5272d929fb9c1838593a6347ca10",
"type": "github"
},
"original": {
@ -105,11 +89,11 @@
"cachyos-kernel-patches": {
"flake": false,
"locked": {
"lastModified": 1771516433,
"narHash": "sha256-SuockPZgd2bfjWGmdT8AUBTnBZWvxdA+b8Ss98lNC6c=",
"lastModified": 1772731186,
"narHash": "sha256-y70pS9Cma7+WCsni3VTacHh9g/udulmBS6zrYE2Fz64=",
"owner": "CachyOS",
"repo": "kernel-patches",
"rev": "505aef2086e584ba683a5ac1cb8ed8252fea2cfd",
"rev": "eac8168ee15f742547d4d20ba5c7fea283f23019",
"type": "github"
},
"original": {
@ -170,11 +154,11 @@
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1769996383,
"narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
"lastModified": 1772408722,
"narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
"rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3",
"type": "github"
},
"original": {
@ -191,11 +175,11 @@
]
},
"locked": {
"lastModified": 1768135262,
"narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=",
"lastModified": 1769996383,
"narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac",
"rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
"type": "github"
},
"original": {
@ -270,11 +254,11 @@
]
},
"locked": {
"lastModified": 1769579508,
"narHash": "sha256-EE2bs7xFrC64qrj0N2zP6E6e/nmhcdw6v/grdYi+BiY=",
"lastModified": 1773093840,
"narHash": "sha256-u/96NoAyN8BSRuM3ZimGf7vyYgXa3pLx4MYWjokuoH4=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "eec72f127831326b042d1f35003767a4ab6a9516",
"rev": "bb014746edb2a98d975abde4dd40fa240de4cf86",
"type": "github"
},
"original": {
@ -360,11 +344,11 @@
"xdph": "xdph"
},
"locked": {
"lastModified": 1772297734,
"narHash": "sha256-ASoB8+3t/DNKWv2LCEDjUP+tV2+Mi6Lzi5lryXGN2B0=",
"lastModified": 1773082851,
"narHash": "sha256-xeeeJ1gt4SoskgHW67PVX5p7cDlZFSyX5n4eUSPjxT8=",
"owner": "hyprwm",
"repo": "Hyprland",
"rev": "1c64ef06d9cb555fc562345c172c45e95c3b3077",
"rev": "e32eeb1d454b029a24ca71f410896bf52839085d",
"type": "github"
},
"original": {
@ -637,11 +621,11 @@
"niri-blur": {
"flake": false,
"locked": {
"lastModified": 1772514470,
"narHash": "sha256-nSrfHwbjg8/Rfx5pqDqU8bL5IWh99MsvxfjNZYxqEFw=",
"lastModified": 1772873838,
"narHash": "sha256-pFh7J2fBqsZvZrD26zfOj30qTM8+7PLZsNSLX+VOcUA=",
"owner": "niri-wm",
"repo": "niri",
"rev": "c837d944f0cc08580ee86574dd0c3a68ca9379a4",
"rev": "5393902dd22e9d540438ee178775f1e488eea724",
"type": "github"
},
"original": {
@ -677,11 +661,11 @@
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1771525883,
"narHash": "sha256-XqDuaRbxLGno5HcWRE5lQrgMBeXXs6ncGq+R6eCvsq8=",
"lastModified": 1772992385,
"narHash": "sha256-nHFrO9rNXV4p28SPkVcaVM8wds9s6ouivnMELo4fXms=",
"owner": "xddxdd",
"repo": "nix-cachyos-kernel",
"rev": "15fb6039dd248d478a8f3f7f6c067b206da2bf54",
"rev": "c7fac23ec3da662ca8e2fac8ba60076d5e06c6b1",
"type": "github"
},
"original": {
@ -709,11 +693,11 @@
},
"nixpkgs-lib": {
"locked": {
"lastModified": 1769909678,
"narHash": "sha256-cBEymOf4/o3FD5AZnzC3J9hLbiZ+QDT/KDuyHXVJOpM=",
"lastModified": 1772328832,
"narHash": "sha256-e+/T/pmEkLP6BHhYjx6GmwP5ivonQQn0bJdH9YrRB+Q=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "72716169fe93074c333e8d0173151350670b824c",
"rev": "c185c7a5e5dd8f9add5b2f8ebeff00888b070742",
"type": "github"
},
"original": {
@ -724,11 +708,11 @@
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1769598131,
"narHash": "sha256-e7VO/kGLgRMbWtpBqdWl0uFg8Y2XWFMdz0uUJvlML8o=",
"lastModified": 1772822230,
"narHash": "sha256-yf3iYLGbGVlIthlQIk5/4/EQDZNNEmuqKZkQssMljuw=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "fa83fd837f3098e3e678e6cf017b2b36102c7211",
"rev": "71caefce12ba78d84fe618cf61644dce01cf3a96",
"type": "github"
},
"original": {
@ -740,11 +724,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1769461804,
"narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=",
"lastModified": 1772963539,
"narHash": "sha256-9jVDGZnvCckTGdYT53d/EfznygLskyLQXYwJLKMPsZs=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d",
"rev": "9dcb002ca1690658be4a04645215baea8b95f31d",
"type": "github"
},
"original": {
@ -756,11 +740,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1771482645,
"narHash": "sha256-MpAKyXfJRDTgRU33Hja+G+3h9ywLAJJNRq4Pjbb4dQs=",
"lastModified": 1772963539,
"narHash": "sha256-9jVDGZnvCckTGdYT53d/EfznygLskyLQXYwJLKMPsZs=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "724cf38d99ba81fbb4a347081db93e2e3a9bc2ae",
"rev": "9dcb002ca1690658be4a04645215baea8b95f31d",
"type": "github"
},
"original": {
@ -779,11 +763,11 @@
"systems": "systems_2"
},
"locked": {
"lastModified": 1769537308,
"narHash": "sha256-N7famD4s2hiDIicr9mJWhUj8l9EULB60+1QN/S+UjeM=",
"lastModified": 1772402258,
"narHash": "sha256-3DmCFOdmbkFML1/G9gj8Wb+rCCZFPOQtNoMCpqOF8SA=",
"owner": "nix-community",
"repo": "nixvim",
"rev": "7addac6d111837217c16762968a9042eac703f7e",
"rev": "21ae25e13b01d3b4cdc750b5f9e7bad68b150c10",
"type": "github"
},
"original": {
@ -796,14 +780,15 @@
"inputs": {
"nixpkgs": [
"nixpkgs"
]
],
"noctalia-qs": "noctalia-qs"
},
"locked": {
"lastModified": 1769607092,
"narHash": "sha256-P0KGVjKtN+hkZWskpxr2iXWalPb0SKAgRVyMFZxdxf0=",
"lastModified": 1773090974,
"narHash": "sha256-D9dpV+/TMVLO34Q/cZADB68OvmDbFt+9ydxyXpFEVjY=",
"owner": "noctalia-dev",
"repo": "noctalia-shell",
"rev": "b2b16ecdda1bc04001a7c714bf8124160a86ddfc",
"rev": "44045fa02045300304b9d1cb0d6c0a9988fc4772",
"type": "github"
},
"original": {
@ -812,6 +797,27 @@
"type": "github"
}
},
"noctalia-qs": {
"inputs": {
"nixpkgs": [
"noctalia",
"nixpkgs"
]
},
"locked": {
"lastModified": 1772673824,
"narHash": "sha256-TLHXPoELZA6VeuzC1Zpx+MnSsYzrJs+DSieMgfjAOJc=",
"owner": "noctalia-dev",
"repo": "noctalia-qs",
"rev": "f8531192cd09b9ea2e78d18e9cfc9d3dba498690",
"type": "github"
},
"original": {
"owner": "noctalia-dev",
"repo": "noctalia-qs",
"type": "github"
}
},
"nur": {
"inputs": {
"flake-parts": "flake-parts_3",
@ -820,11 +826,11 @@
]
},
"locked": {
"lastModified": 1769604042,
"narHash": "sha256-KQGbmKSY3tA4S8qFN76xd+3cbM0mAtPgoUVbjWrprcs=",
"lastModified": 1773104692,
"narHash": "sha256-Knyv6e1o+W2fqJ/S9dDJxTpOMmnZi6OgN0vdx6tf9Uw=",
"owner": "nix-community",
"repo": "NUR",
"rev": "92f5f3f18a365341dd424314a80253f5ede071e4",
"rev": "ed329bf1d83aa3cb2cd5151a4e6fbe7f9fee9ec2",
"type": "github"
},
"original": {
@ -860,11 +866,11 @@
]
},
"locked": {
"lastModified": 1767662275,
"narHash": "sha256-d5Q1GmQ+sW1Bt8cgDE0vOihzLaswsm8cSdg8124EqXE=",
"lastModified": 1772361940,
"narHash": "sha256-B1Cz+ydL1iaOnGlwOFld/C8lBECPtzhiy/pP93/CuyY=",
"owner": "nix-community",
"repo": "plasma-manager",
"rev": "51816be33a1ff0d4b22427de83222d5bfa96d30e",
"rev": "a4b33606111c9c5dcd10009042bb710307174f51",
"type": "github"
},
"original": {
@ -883,11 +889,11 @@
]
},
"locked": {
"lastModified": 1771858127,
"narHash": "sha256-Gtre9YoYl3n25tJH2AoSdjuwcqij5CPxL3U3xysYD08=",
"lastModified": 1772024342,
"narHash": "sha256-+eXlIc4/7dE6EcPs9a2DaSY3fTA9AE526hGqkNID3Wg=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "49bbbfc218bf3856dfa631cead3b052d78248b83",
"rev": "6e34e97ed9788b17796ee43ccdbaf871a5c2b476",
"type": "github"
},
"original": {
@ -900,7 +906,6 @@
"inputs": {
"apple-silicon": "apple-silicon",
"base16": "base16",
"base16-discord": "base16-discord",
"home-manager": "home-manager",
"hyprland": "hyprland",
"niri": "niri",

View file

@ -17,11 +17,6 @@
flake = false;
};
base16-discord = {
url = "github:imbypass/base16-discord";
flake = false;
};
home-manager = {
url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs";
@ -79,7 +74,6 @@
apple-silicon,
base16,
tt-schemes,
base16-discord,
home-manager,
plasma-manager,
niri,
@ -132,7 +126,6 @@
nur.overlays.default
(final: prev: {
openmw-git = openmw;
base16-discord-git = base16-discord;
})
(import ./packages/overlay.nix)
];
@ -183,6 +176,7 @@
"wheel"
"networkmanager"
"podman"
"pipewire"
];
hashedPassword = "$6$bvwRUFaJNMpH8rm3$FGDWFN6tBScJ/2DynAjnlZE8JRfyADN78d6c4GawxpAjyNLNE/AjQzMA09tLRqpKX7WnN5PIUZLAm2bT9/RbG0";
openssh.authorizedKeys.keys = [

View file

@ -12,7 +12,6 @@
input-leap
libreoffice-qt-fresh
# nur.repos.forkprince.helium-nightly
chromium
nautilus
fractal
tuba
@ -29,8 +28,8 @@
spotify-player
# overrides
# (chromium.override {
# enableWideVine = true;
# })
(chromium.override {
enableWideVine = true;
})
];
}

View file

@ -4,9 +4,8 @@
...
}:
let
mergedThemes = pkgs.runCommand "mergedConfig" { } ''
mergedThemes = pkgs.runCommand "discordThemeDir" { } ''
mkdir -p $out
cp -rvf ${pkgs.base16-discord-git}/base16.css $out/base16.css
'';
vesktopSettings = {

View file

@ -4,7 +4,9 @@
...
}:
let
btop-colors = with config.scheme.withHashtag; ''
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}"
@ -90,21 +92,17 @@ let
theme[process_mid]="${base07}"
theme[process_end]="${base0E}"
'';
btop-colors-file = pkgs.writeTextFile {
name = "btop-colors";
text = btop-colors;
destination = "/nixos.theme";
};
mergedConfig = pkgs.runCommand "mergedConfig" { } ''
batConfigDir = pkgs.runCommand "mergedConfig" { } ''
mkdir -p $out/themes
cp -r ${btop-colors-file}/nixos.theme $out/themes/nixos.theme
'';
in
{
home.file.".config/btop" = {
source = mergedConfig;
source = batConfigDir;
recursive = true;
};
}

View file

@ -28,6 +28,9 @@
browsh
mosh
gh
kdePackages.qttools
eza
pigz
# development & tooling
jdk21_headless
@ -42,9 +45,19 @@
flaresolverr
nerd-fonts.fira-mono
ffmpeg-full
# formatters
kdePackages.qtdeclarative
prettier
prettierd
nixfmt
stylua
black
clang-tools
];
programs.git = {
programs = {
git = {
enable = true;
settings = {
user = {
@ -55,4 +68,14 @@
commit.gpgsign = true;
};
};
bat = {
enable = true;
config.style = "numbers,changes";
};
lazygit = {
enable = true;
enableFishIntegration = true;
};
lazysql.enable = true;
};
}

View file

@ -1,16 +1,9 @@
{
pkgs,
config,
lib,
...
}:
{
home.packages = with pkgs; [
kdePackages.qttools
eza
pigz
];
programs.fish = {
enable = true;
shellAliases = {

View file

@ -128,14 +128,5 @@ in
macos_titlebar_color = "system";
};
};
bat = {
enable = true;
# config.theme = "Catppuccin ${config.catppuccinUpper.flavor}";
};
lazygit = {
enable = true;
enableFishIntegration = true;
};
lazysql.enable = true;
};
}

View file

@ -7,16 +7,6 @@
{
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;

View file

@ -80,7 +80,7 @@ pkgs.stdenv.mkDerivation {
echo "Rendering complete. Building XCursor theme..."
echo "4. Build the final cursors"
ctgen configs/right/x.build.toml -s ${cursorSizes} -p x11 -d "bitmaps/${themeName}" -n "${themeName}" -c "${themeName} cursors"
ctgen configs/normal/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
mkdir -p $out/share/icons
install -dm 0755 $out/share/icons
cp -r themes/${themeName} $out/share/icons/
runHook postInstall

View file

@ -114,6 +114,8 @@
printing.enable = true;
pipewire = {
enable = true;
systemWide = true;
wireplumber.enable = true;
alsa.enable = true;
alsa.support32Bit = true;
pulse.enable = true;
@ -164,7 +166,6 @@
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";

View file

@ -81,4 +81,16 @@
"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" ];
};
}

View file

@ -1,6 +1,5 @@
{
pkgs,
config,
lib,
...
}:
@ -26,6 +25,13 @@ 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";

View file

@ -19,5 +19,4 @@
alias edit "nvim"
'';
};
documentation.man.generateCaches = false;
}