removing unnecessary modules

This commit is contained in:
Charlie Root 2024-08-13 11:00:58 +02:00
commit 0ebcdef58b
11 changed files with 108 additions and 316 deletions

256
flake.lock generated
View file

@ -1,31 +1,12 @@
{
"nodes": {
"ags": {
"inputs": {
"nixpkgs": "nixpkgs",
"systems": "systems"
},
"locked": {
"lastModified": 1721306136,
"narHash": "sha256-VKPsIGf3/a+RONBipx4lEE4LXG2sdMNkWQu22LNQItg=",
"owner": "Aylur",
"repo": "ags",
"rev": "344ea72cd3b8d4911f362fec34bce7d8fb37028c",
"type": "github"
},
"original": {
"owner": "Aylur",
"repo": "ags",
"type": "github"
}
},
"anyrun": {
"inputs": {
"flake-parts": "flake-parts",
"nixpkgs": [
"nixpkgs"
],
"systems": "systems_2"
"systems": "systems"
},
"locked": {
"lastModified": 1721135360,
@ -254,7 +235,7 @@
"emacs-overlay": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs_2",
"nixpkgs": "nixpkgs",
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
@ -335,6 +316,22 @@
}
},
"flake-compat_5": {
"flake": false,
"locked": {
"lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-compat_6": {
"flake": false,
"locked": {
"lastModified": 1673956053,
@ -512,7 +509,7 @@
},
"flake-utils": {
"inputs": {
"systems": "systems_3"
"systems": "systems_2"
},
"locked": {
"lastModified": 1710146030,
@ -530,7 +527,7 @@
},
"flake-utils_2": {
"inputs": {
"systems": "systems_4"
"systems": "systems_3"
},
"locked": {
"lastModified": 1709126324,
@ -548,7 +545,7 @@
},
"flake-utils_3": {
"inputs": {
"systems": "systems_6"
"systems": "systems_5"
},
"locked": {
"lastModified": 1710146030,
@ -596,7 +593,7 @@
},
"flake-utils_6": {
"inputs": {
"systems": "systems_8"
"systems": "systems_7"
},
"locked": {
"lastModified": 1710146030,
@ -612,24 +609,6 @@
"type": "github"
}
},
"flake-utils_7": {
"inputs": {
"systems": "systems_10"
},
"locked": {
"lastModified": 1685518550,
"narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"fromYaml": {
"flake": false,
"locked": {
@ -667,7 +646,7 @@
"inputs": {
"crane": "crane",
"flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs_3",
"nixpkgs": "nixpkgs_2",
"rust-overlay": "rust-overlay"
},
"locked": {
@ -807,8 +786,8 @@
"hyprlang": "hyprlang",
"hyprutils": "hyprutils",
"hyprwayland-scanner": "hyprwayland-scanner",
"nixpkgs": "nixpkgs_4",
"systems": "systems_5",
"nixpkgs": "nixpkgs_3",
"systems": "systems_4",
"xdph": "xdph"
},
"locked": {
@ -1160,7 +1139,7 @@
"plugin-vim-vsnip": "plugin-vim-vsnip",
"plugin-which-key": "plugin-which-key",
"rnix-lsp": "rnix-lsp",
"systems": "systems_7",
"systems": "systems_6",
"zig": "zig"
},
"locked": {
@ -1207,7 +1186,7 @@
"inputs": {
"flake-parts": "flake-parts_6",
"nix-github-actions": "nix-github-actions",
"nixpkgs": "nixpkgs_9",
"nixpkgs": "nixpkgs_8",
"treefmt-nix": "treefmt-nix"
},
"locked": {
@ -1266,7 +1245,7 @@
"flake-compat": "flake-compat_2",
"flake-parts": "flake-parts_4",
"libgit2": "libgit2",
"nixpkgs": "nixpkgs_7",
"nixpkgs": "nixpkgs_6",
"nixpkgs-23-11": "nixpkgs-23-11",
"nixpkgs-regression": "nixpkgs-regression",
"pre-commit-hooks": "pre-commit-hooks"
@ -1325,11 +1304,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1718714799,
"narHash": "sha256-FUZpz9rg3gL8NVPKbqU8ei1VkPLsTIfAJ2fdAf5qjak=",
"lastModified": 1722813957,
"narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c00d587b1a1afbf200b1d8f0b0e4ba9deb1c7f0e",
"rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa",
"type": "github"
},
"original": {
@ -1449,7 +1428,7 @@
"flake-compat": "flake-compat_3",
"lib-aggregate": "lib-aggregate",
"nix-eval-jobs": "nix-eval-jobs",
"nixpkgs": "nixpkgs_10"
"nixpkgs": "nixpkgs_9"
},
"locked": {
"lastModified": 1723043911,
@ -1466,38 +1445,6 @@
}
},
"nixpkgs_10": {
"locked": {
"lastModified": 1722813957,
"narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_11": {
"locked": {
"lastModified": 1686020360,
"narHash": "sha256-Wee7lIlZ6DIZHHLiNxU5KdYZQl0iprENXa/czzI6Cj4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "4729ffac6fd12e26e5a8de002781ffc49b0e94b7",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_12": {
"locked": {
"lastModified": 1714912032,
"narHash": "sha256-clkcOIkg8G4xuJh+1onLG4HPMpbtzdLv4rHxFzgsH9c=",
@ -1513,7 +1460,7 @@
"type": "github"
}
},
"nixpkgs_13": {
"nixpkgs_11": {
"locked": {
"lastModified": 1720957393,
"narHash": "sha256-oedh2RwpjEa+TNxhg5Je9Ch6d3W1NKi7DbRO1ziHemA=",
@ -1530,22 +1477,6 @@
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1722813957,
"narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1709479366,
"narHash": "sha256-n6F0n8UV6lnTZbYPl1A9q1BS0p4hduAv1mGAP17CVd0=",
@ -1561,7 +1492,7 @@
"type": "github"
}
},
"nixpkgs_4": {
"nixpkgs_3": {
"locked": {
"lastModified": 1722185531,
"narHash": "sha256-veKR07psFoJjINLC8RK4DiLniGGMgF3QMlS4tb74S6k=",
@ -1577,7 +1508,7 @@
"type": "github"
}
},
"nixpkgs_5": {
"nixpkgs_4": {
"locked": {
"lastModified": 1656753965,
"narHash": "sha256-BCrB3l0qpJokOnIVc3g2lHiGhnjUi0MoXiw6t1o8H1E=",
@ -1593,7 +1524,7 @@
"type": "github"
}
},
"nixpkgs_6": {
"nixpkgs_5": {
"locked": {
"lastModified": 1702350026,
"narHash": "sha256-A+GNZFZdfl4JdDphYKBJ5Ef1HOiFsP18vQe9mqjmUis=",
@ -1609,7 +1540,7 @@
"type": "github"
}
},
"nixpkgs_7": {
"nixpkgs_6": {
"locked": {
"lastModified": 1723136237,
"narHash": "sha256-f2yp4ScD1d5D4DneqMVrndFGKHMhYcxxC5oWTEn2iDM=",
@ -1625,7 +1556,7 @@
"type": "github"
}
},
"nixpkgs_8": {
"nixpkgs_7": {
"locked": {
"lastModified": 1722813957,
"narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=",
@ -1641,7 +1572,7 @@
"type": "github"
}
},
"nixpkgs_9": {
"nixpkgs_8": {
"locked": {
"lastModified": 1720781449,
"narHash": "sha256-po3TZO9kcZwzvkyMJKb0WCzzDtiHWD34XeRaX1lWXp0=",
@ -1657,6 +1588,22 @@
"type": "github"
}
},
"nixpkgs_9": {
"locked": {
"lastModified": 1722813957,
"narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nmd": {
"flake": false,
"locked": {
@ -3313,7 +3260,7 @@
"rnix-lsp": {
"inputs": {
"naersk": "naersk",
"nixpkgs": "nixpkgs_5",
"nixpkgs": "nixpkgs_4",
"utils": "utils"
},
"locked": {
@ -3332,7 +3279,6 @@
},
"root": {
"inputs": {
"ags": "ags",
"anyrun": "anyrun",
"devshell": "devshell",
"emacs-overlay": "emacs-overlay",
@ -3346,7 +3292,7 @@
"nix-super": "nix-super",
"nixos-hardware": "nixos-hardware",
"nixpak": "nixpak",
"nixpkgs": "nixpkgs_8",
"nixpkgs": "nixpkgs_7",
"nixpkgs-wayland": "nixpkgs-wayland",
"quickshell": "quickshell",
"schizofox": "schizofox",
@ -3420,7 +3366,7 @@
"nixpkgs"
],
"searx-randomizer": "searx-randomizer",
"systems": "systems_9"
"systems": "systems_8"
},
"locked": {
"lastModified": 1722689807,
@ -3461,19 +3407,21 @@
},
"spicetify-nix": {
"inputs": {
"flake-utils": "flake-utils_7",
"nixpkgs": "nixpkgs_11"
"flake-compat": "flake-compat_5",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1704167711,
"narHash": "sha256-kFDq+kf/Di/P8bq5sUP8pVwRkrSVrABksBjMPmLic3s=",
"owner": "the-argus",
"lastModified": 1723176741,
"narHash": "sha256-KUZV6lGlhRrzB50a1+Z+aOtgtp7X9wn7I4HfdxR+vHA=",
"owner": "gerg-l",
"repo": "spicetify-nix",
"rev": "1325416f951d6a82cfddb1289864ad782e2b87c4",
"rev": "9f1c108224c9de975896014f10479a66243206c2",
"type": "github"
},
"original": {
"owner": "the-argus",
"owner": "gerg-l",
"repo": "spicetify-nix",
"type": "github"
}
@ -3508,10 +3456,10 @@
"base16-kitty": "base16-kitty",
"base16-tmux": "base16-tmux",
"base16-vim": "base16-vim",
"flake-compat": "flake-compat_5",
"flake-compat": "flake-compat_6",
"gnome-shell": "gnome-shell",
"home-manager": "home-manager_3",
"nixpkgs": "nixpkgs_12"
"nixpkgs": "nixpkgs_10"
},
"locked": {
"lastModified": 1722946882,
@ -3542,7 +3490,7 @@
"type": "github"
}
},
"systems_10": {
"systems_2": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@ -3557,21 +3505,6 @@
"type": "github"
}
},
"systems_2": {
"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"
}
},
"systems_3": {
"locked": {
"lastModified": 1681028828,
@ -3588,21 +3521,6 @@
}
},
"systems_4": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_5": {
"locked": {
"lastModified": 1689347949,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
@ -3617,6 +3535,21 @@
"type": "github"
}
},
"systems_5": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_6": {
"locked": {
"lastModified": 1681028828,
@ -3648,21 +3581,6 @@
}
},
"systems_8": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_9": {
"locked": {
"lastModified": 1689347949,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
@ -3701,7 +3619,7 @@
},
"treefmt-nix_2": {
"inputs": {
"nixpkgs": "nixpkgs_13"
"nixpkgs": "nixpkgs_11"
},
"locked": {
"lastModified": 1722330636,
@ -3766,7 +3684,7 @@
"inputs": {
"flake-compat": "flake-compat",
"flake-utils": "flake-utils_4",
"nixpkgs": "nixpkgs_6"
"nixpkgs": "nixpkgs_5"
},
"locked": {
"lastModified": 1716725305,

View file

@ -98,6 +98,9 @@
};
};
spicetify-nix.url = "github:the-argus/spicetify-nix";
spicetify-nix = {
url = "github:gerg-l/spicetify-nix";
inputs.nixpkgs.follows = "nixpkgs";
};
};
}

View file

@ -45,6 +45,7 @@ in {
helvum
hmm
httpie
hyperfine
imagemagick
img2pdf
impala

View file

@ -35,7 +35,7 @@
};
discord.enable = true;
firefox.enable = true;
# spotify.enable = true;
spotify.enable = true;
zellij.enable = true;
terminals = {
foot.enable = true;

View file

@ -9,6 +9,7 @@ in {
alsa-utils
asciinema
blanket
calc
calibre
cbonsai
coreutils-full
@ -34,6 +35,7 @@ in {
helvum
heroic
httpie
hyperfine
imagemagickBig
img2pdf
impala

View file

@ -25,7 +25,6 @@ in {
];
plugins = [
# "acousticbrainz" # DEPRECATED
"mpdupdate"
"lyrics"
"thumbnails"
@ -34,11 +33,8 @@ in {
"chroma"
"fromfilename"
"lastgenre"
#"absubmit" # DEPRECATED
"duplicates"
"edit"
#"mbcollection" # not set up yet
# "mbsync"
"replaygain"
"scrub"
];

View file

@ -15,7 +15,6 @@ in {
enableFishIntegration = true;
settings = {
layout_dir = "${./layouts}";
on_force_close = "quit";
pane_frames = false;
default_layout = "compact";

View file

@ -1,127 +0,0 @@
// this is my custom "system" layout, loosely based on the official
// zellij development layout - it's simplified for desktop use
// and allows me to remain in a single workspace even when I'm
// using a tiling window manager and am constrained to a single
// workspace. It provides default tabs for media, file browsing
// which should be everything that I need, but I may add more
// in the future
layout {
// define default tab layout
default_tab_template {
// tab bar on the top
pane size=1 borderless=true {
plugin location="zellij:tab-bar"
}
// child tabs and panes
children
// status bar on the bottom
pane size=2 borderless=true {
plugin location="zellij:status-bar"
}
}
// strider tab uses the strider plugin of zellij
// which is similar to neovim's nvimtree
// ...but slower and much less configurable
tab_template name="strider_tab" {
pane size=1 borderless=true {
plugin location="zellij:tab-bar"
}
// use the strider plugin on the left side of the screen
// to achieve a nvim-tree like layout on the left 15% of
// the terminal window - looks cool but is not flexible
pane split_direction="Vertical" {
pane size="15%" name="Filetree" {
plugin location="zellij:strider"
}
children
}
pane size=2 borderless=true {
plugin location="zellij:status-bar"
}
}
// define a template pane for the terminal
// this once again imitates the neovim layout
// by providing a terminal instance on the bottom
// 25% of the screen that enters the z shell when
// zellij starts - the exec duration for zsh matters
// here as it'll repeat for each "tab" that exists
pane_template name="term" {
// horizontal split to place the terminal
// on the bottom half of the screen like the
// toggleterm neovim plugin
pane split_direction="horizontal" {
children
pane command="fish" size="25%" name="Shell"
}
}
// create a "strider tab" for my system configuration
// which is a tab that utilizes the strider tab template
// that we have defined earlier, provides a file-tree
// view in my system config directory, and opens flake.nix
// with the $EDITOR variable - has focus, is the first tab
strider_tab name="nichts" cwd="~/projects/nichts" focus=true {
term split_direction="vertical" {
// FIXME: edit does not open the file from cwd
// instead opens a buffer named flake.nix in cwd
// which should be the original flake.nix
// but is not
pane edit="./flake.nix" name="Flake"
}
}
// regular vertical tab that will open btop automatically for
// viewing active processes in a standalone tab
// more utilities can go here if seen necessary
tab name="Processes" split_direction="vertical" {
pane {
// open btop in the home directory
// doesn't really matter where you open it
cwd "$HOME"
command "btop"
}
}
// the media tab opens musikcube, the TUI music player
// and pulsemixer for volume control across different
// audio devices - this is split horizontally so that
// the mixer covers less space on the screen, at the
// bottom 35% of the active tab
tab name="Media" split_direction="vertical" {
// run musikcube in the Music directory
// the CWD doesn't really matter as musikcube
// is capable of binding to mpd daemon but
// the music directory seemed suitable as
// the working directory for the player
pane split_direction="horizontal" name="Player" {
pane {
cwd "$HOME/Nextcloud/Media/Music"
command "ncmpcpp"
}
}
// standalone pane for pulsemixer
pane split_direction="horizontal" name="Mixer" {
pane size="35%" {
command "pulsemixer"
}
}
}
// The last tab is a file browser that opens in the home directory
// so that I may freely browse my files and open them using the XDG
// specs when yazi can handle the file type.
tab name="Files" split_direction="horizontal" name="Files" {
pane {
cwd "$HOME"
command "yazi"
}
}
}

View file

@ -8,22 +8,23 @@
}: let
cfg = config.modules.system.programs.spotify;
inherit (config.modules.other.system) username;
spicePkgs = inputs'.spicetify-nix.packages.default;
spicePkgs = inputs'.spicetify-nix.legacyPackages;
in {
config = lib.mkIf cfg.enable {
home-manager.users.${username} = {
imports = [inputs.spicetify-nix.homeManagerModule];
imports = [inputs.spicetify-nix.homeManagerModules.default];
programs.spicetify = {
enable = true;
spotifyPackage = pkgs.spotify;
#theme = spicePkgs.themes.Onepunch;
#colorScheme = "mocha";
enabledExtensions = with spicePkgs.extensions; [
theme = spicePkgs.themes.catppuccin;
colorScheme = "mocha";
# enabledExtensions = with spicePkgs.extensions; [
# shuffle
adblock
#genre
# popupLyrics
# adblock
# betterGenres
# playlistIcons
];
# ];
};
};
};

View file

@ -6,7 +6,7 @@
...
}: let
cfg = config.modules.usrEnv.style.stylix;
inherit (config.modules.usrEnv.style.stylix) scheme image cursor fontsizes;
inherit (config.modules.usrEnv.style.stylix) image cursor fontsizes;
inherit (config.modules.other.system) username;
inherit (lib) mkIf;
in {

View file

@ -1,7 +1,6 @@
{config, ...}: {
services.xserver.videoDrivers = ["nvidia"];
hardware = {
opengl.enable = true;
graphics = {
enable = true;
};