cleaning by inlining tiny files

This commit is contained in:
xunuwu 2025-04-17 13:36:47 +02:00
parent c046eadcea
commit 2928310925
Signed by: xun
SSH key fingerprint: SHA256:Uot/1WoAjWAeqLOHA5vYy4phhVydsH7jCPmBjaPZfgI
42 changed files with 75 additions and 313 deletions

47
flake.lock generated
View file

@ -196,22 +196,6 @@
}
},
"flake-compat_3": {
"flake": false,
"locked": {
"lastModified": 1733328505,
"narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-compat_4": {
"flake": false,
"locked": {
"lastModified": 1696426674,
@ -227,7 +211,7 @@
"type": "github"
}
},
"flake-compat_5": {
"flake-compat_4": {
"locked": {
"lastModified": 1733328505,
"narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
@ -439,7 +423,7 @@
},
"git-hooks": {
"inputs": {
"flake-compat": "flake-compat_4",
"flake-compat": "flake-compat_3",
"gitignore": "gitignore",
"nixpkgs": [
"nvim-config",
@ -656,7 +640,7 @@
},
"neovim-nightly-overlay": {
"inputs": {
"flake-compat": "flake-compat_3",
"flake-compat": "flake-compat_2",
"flake-parts": "flake-parts_3",
"git-hooks": "git-hooks",
"hercules-ci-effects": "hercules-ci-effects",
@ -736,28 +720,6 @@
"type": "github"
}
},
"nixos-wsl": {
"inputs": {
"flake-compat": "flake-compat_2",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1742999260,
"narHash": "sha256-wgeb7kSod9MAGm39MsVLsy2zxSbtCtckCkgfbjg6TLM=",
"owner": "nix-community",
"repo": "NixOS-WSL",
"rev": "64d679540fa4d7e2afdbbb53ea63e3e5019c1f52",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "main",
"repo": "NixOS-WSL",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1740367490,
@ -901,7 +863,6 @@
"hardware": "hardware",
"home-manager": "home-manager",
"nix-index-database": "nix-index-database",
"nixos-wsl": "nixos-wsl",
"nixpkgs": "nixpkgs_2",
"nvim-config": "nvim-config",
"sobercookie": "sobercookie",
@ -959,7 +920,7 @@
"base16-helix": "base16-helix",
"base16-vim": "base16-vim",
"firefox-gnome-theme": "firefox-gnome-theme",
"flake-compat": "flake-compat_5",
"flake-compat": "flake-compat_4",
"flake-utils": "flake-utils_3",
"git-hooks": "git-hooks_2",
"gnome-shell": "gnome-shell",

View file

@ -54,9 +54,6 @@
nix-index-database.url = "github:Mic92/nix-index-database";
nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
nixos-wsl.url = "github:nix-community/NixOS-WSL/main";
nixos-wsl.inputs.nixpkgs.follows = "nixpkgs";
authentik-nix.url = "github:nix-community/authentik-nix";
# nvfetcher.url = "github:berberman/nvfetcher";

View file

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

View file

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

View file

@ -1,3 +0,0 @@
{pkgs, ...}: {
home.packages = with pkgs; [android-studio];
}

View file

@ -1,13 +0,0 @@
{pkgs, ...}: {
home.packages = with pkgs; [
(symlinkJoin {
name = "idea-ultimate";
paths = [jetbrains.idea-ultimate];
buildInputs = [makeWrapper];
postBuild = ''
wrapProgram $out/bin/idea-ultimate \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [libGL]}"
'';
})
];
}

View file

@ -1,3 +0,0 @@
{pkgs, ...}: {
home.packages = with pkgs.jetbrains; [rider];
}

View file

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

View file

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

View file

@ -1,9 +0,0 @@
{
self,
pkgs,
...
}: {
home.packages = [
self.packages.${pkgs.system}.krunker
];
}

View file

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

View file

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

View file

@ -1,10 +0,0 @@
{
inputs,
pkgs,
...
}: {
# i have sober installed imperatively through flatpak
home.packages = [
inputs.sobercookie.packages.${pkgs.system}.default
];
}

View file

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

View file

@ -1,6 +0,0 @@
{pkgs, ...}: {
home.packages = with pkgs; [
jellyfin-media-player
feishin
];
}

View file

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

View file

@ -1,3 +0,0 @@
{pkgs, ...}: {
home.packages = [pkgs.bitwarden-desktop];
}

View file

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

View file

@ -1,3 +0,0 @@
{pkgs, ...}: {
home.packages = with pkgs; [kdePackages.dolphin];
}

View file

@ -1,3 +0,0 @@
{pkgs, ...}: {
home.packages = with pkgs; [element-desktop];
}

View file

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

View file

@ -1,3 +0,0 @@
{pkgs, ...}: {
home.packages = [pkgs.keepassxc];
}

View file

@ -1,3 +0,0 @@
{pkgs, ...}: {
home.packages = [pkgs.krita];
}

View file

@ -1,3 +0,0 @@
{pkgs, ...}: {
home.packages = with pkgs; [libreoffice-qt6];
}

View file

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

View file

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

View file

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

View file

@ -1,3 +0,0 @@
{pkgs, ...}: {
home.packages = [pkgs.picard];
}

View file

@ -1,3 +0,0 @@
{pkgs, ...}: {
home.packages = [pkgs.puddletag];
}

View file

@ -1,3 +0,0 @@
{
services.udiskie.enable = true;
}

View file

@ -1,3 +0,0 @@
{
programs.lazygit.enable = true;
}

View file

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

View file

@ -1,3 +0,0 @@
{
programs.zoxide.enable = true;
}

View file

@ -1,5 +0,0 @@
{
programs.starship = {
enable = true;
};
}

View file

@ -1,6 +1,7 @@
{
homeProfiles,
lib,
pkgs,
...
}: {
imports = with homeProfiles; [
@ -13,19 +14,24 @@
programs.desktop.default
programs.desktop.sway.default
programs.misc.pwvucontrol
programs.misc.qpwgraph
programs.media.mpv
programs.media.stremio
services.playerctl
services.polkit-agent
services.udiskie
];
wayland.windowManager.sway.config.output."HDMI-A-1".scale = "2.0";
services = {
udiskie.enable = true;
};
home.packages = with pkgs; [
pwvucontrol
qpwgraph
stremio
];
home = {
username = "desktop";
homeDirectory = lib.mkForce "/home/desktop";

View file

@ -1,23 +0,0 @@
{homeProfiles, ...}: {
imports = with homeProfiles; [
default
# editors.emacs
editors.nvim
terminal.shell.zsh
terminal.programs.xdg
terminal.programs.direnv
terminal.programs.comma
terminal.programs.tmux
terminal.programs.irssi
develop.langs.nix
develop.tools
develop.devenv
terminal.programs.git
terminal.programs.github
terminal.programs.lazygit
];
}

View file

@ -1,6 +1,7 @@
{
self,
pkgs,
inputs,
homeProfiles,
...
}: {
@ -14,26 +15,18 @@
terminal.shell.zsh
terminal.shell.fish
terminal.shell.starship
terminal.programs.xdg
terminal.programs.direnv
terminal.programs.tmux
terminal.programs.comma
terminal.programs.zoxide
terminal.programs.tdf
terminal.programs.irssi
terminal.programs.git
terminal.programs.github
terminal.programs.lazygit
terminal.programs.jujutsu
# editors.emacs
editors.nvim
editors.vscodium
editors.jetbrains.rider
editors.jetbrains.idea
editors.jetbrains.android-studio
programs.browsers.firefox.default
programs.browsers.tor
@ -50,9 +43,7 @@
# development
develop.common
develop.tools
develop.docs
develop.devenv
develop.langs.haskell
develop.langs.rust
@ -64,41 +55,78 @@
develop.langs.c
# programs
programs.misc.keepassxc
programs.misc.bitwarden
programs.misc.discord
programs.misc.element
programs.misc.obs
programs.misc.krita
programs.misc.foliate
programs.misc.blender
programs.misc.obsidian
programs.misc.dolphin
programs.misc.pwvucontrol
programs.misc.qpwgraph
programs.misc.libreoffice
programs.music.puddletag
programs.music.picard
programs.music.beets
programs.music.cmus
programs.media.mpv
programs.media.jellyfin
programs.media.stremio
# gaming
programs.games.default
programs.games.lutris
programs.games.switch
programs.games.heroic
programs.games.minecraft
programs.games.roblox
programs.games.krunker
services.playerctl
services.polkit-agent
services.udiskie # although i dont need this for usb memory, it is quite convenient for flashing qmk
# services.appusage
];
services = {
udiskie.enable = true;
};
programs = {
starship.enable = true;
zoxide.enable = true;
lazygit.enable = true;
};
home.packages = with pkgs; [
# coding
tokei
devenv
vscodium
android-studio
jetbrains.rider
jetbrains.idea-ultimate
# communication
element-desktop
# audio
pwvucontrol
qpwgraph
# productivity
tdf # terminal pdf reader
obsidian
# passwords
keepassxc
bitwarden-desktop
# creating
krita
blender
libreoffice-qt6
# system things
kdePackages.dolphin
# music
puddletag
picard
# media
stremio
jellyfin-media-player
feishin
foliate
# games
heroic
lutris
ryubing # switch emu
prismlauncher
inputs.sobercookie.packages.${pkgs.system}.default
self.packages.${pkgs.system}.krunker
];
}

View file

@ -2,7 +2,6 @@ config files for my puters
nixdesk - main desktop
hopper - server
kidney - wsl
TODO

View file

@ -1,42 +0,0 @@
{
specialArgs,
systemProfiles,
homeSuites,
...
}: {
imports = with systemProfiles; [
./wsl.nix
./hardware.nix
./fonts.nix
core.tools
core.users
core.locale
programs.tools
programs.zsh
programs.fish
programs.home-manager
hardware.graphics
services.flatpak
services.xdg-portals
nix.default
nix.gc
{
home-manager = {
users.xun.imports = [
homeSuites.kidney
{home.stateVersion = "24.05";}
];
extraSpecialArgs = specialArgs;
};
}
];
networking.hostName = "kidney";
system.stateVersion = "24.05";
}

View file

@ -1,18 +0,0 @@
{
pkgs,
self,
...
}: {
fonts = {
packages = with pkgs; [
font-awesome
iosevka
emacs-all-the-icons-fonts
self.packages.${pkgs.system}.cartograph-cf
];
enableDefaultPackages = false;
fontconfig.defaultFonts = {
monospace = ["Iosevka"];
};
};
}

View file

@ -1,3 +0,0 @@
{
nixpkgs.hostPlatform.system = "x86_64-linux";
}

View file

@ -1,11 +0,0 @@
{inputs, ...}: {
imports = [
inputs.nixos-wsl.nixosModules.default
];
wsl = {
enable = true;
defaultUser = "xun";
startMenuLaunchers = true;
};
}