Compare commits

..

No commits in common. "186d04dbcf620927b7ffbda58fde11d4e98cd402" and "56eea3887a227c834a52736aa953e1105f9f9f46" have entirely different histories.

7 changed files with 205 additions and 218 deletions

View file

@ -55,12 +55,8 @@
} }
) )
]; ];
fructose.modules = [ fructose.modules = [
({ ({pkgs, lib, ...}:{
pkgs,
lib,
...
}: {
nixpkgs.overlays = [ nixpkgs.overlays = [
(final: prev: { (final: prev: {
gts = final.callPackage ./gts.nix {}; gts = final.callPackage ./gts.nix {};

View file

@ -19,7 +19,7 @@
podman = { podman = {
enable = true; enable = true;
dockerCompat = true; dockerCompat = true;
defaultNetwork.settings.dns_enabled = config.networking.hostName == "glucose"; # TODO: fix this stupid shit ssometime -e defaultNetwork.settings.dns_enabled = (config.networking.hostName == "glucose"); # TODO: fix this stupid shit ssometime -e
}; };
oci-containers.backend = "podman"; oci-containers.backend = "podman";
}; };

View file

@ -29,12 +29,12 @@
programs.vscode = { programs.vscode = {
enable = true; enable = true;
package = pkgs.vscodium; package = pkgs.vscodium;
mutableExtensionsDir = false; # turning this one makes it not build. mutableExtensionsDir = false; # turning this one makes it not build.
extensions = with pkgs.vscode-extensions; [ extensions = with pkgs.vscode-extensions; [
rust-lang.rust-analyzer rust-lang.rust-analyzer
tuttieee.emacs-mcx tuttieee.emacs-mcx
tamasfe.even-better-toml tamasfe.even-better-toml
# vadimcn.vscode-lldb# currently doesn't work # vadimcn.vscode-lldb# currently doesn't work
jnoortheen.nix-ide jnoortheen.nix-ide
mkhl.direnv mkhl.direnv
matthewpi.caddyfile-support matthewpi.caddyfile-support

View file

@ -80,7 +80,6 @@ in
boot.kernelModules = [ boot.kernelModules = [
"usbmon" "usbmon"
"v4l2loopback" "v4l2loopback"
"snd-aloop"
]; ];
boot.extraModulePackages = []; boot.extraModulePackages = [];
} }

View file

@ -7,14 +7,5 @@
services.udev.packages = [pkgs.android-udev-rules]; services.udev.packages = [pkgs.android-udev-rules];
} }
) )
({
pkgs,
lib,
config,
...
}: {
programs.droidcam.enable = true;
environment.systemPackages = [pkgs.droidcam];
})
]; ];
} }

View file

@ -24,216 +24,217 @@
pkgs, pkgs,
config, config,
... ...
}: { }:
wayland.windowManager.sway = { {
enable = true; wayland.windowManager.sway = {
systemd.enable = true; enable = true;
systemd.enable = true;
package = pkgs.sway; package = pkgs.sway;
config = { config = {
modifier = "Mod4"; modifier = "Mod4";
fonts = lib.mkDefault { fonts = lib.mkDefault {
names = ["pango"]; names = ["pango"];
style = "monospace"; style = "monospace";
size = 8.0; size = 8.0;
};
terminal = "terminator";
keybindings = let
mod = config.wayland.windowManager.sway.config.modifier;
term = config.wayland.windowManager.sway.config.terminal;
rofi = "rofi";
in {
"${mod}+Return" = "exec ${term}"; # opens a terminal window
"${mod}+Shift+q" = "kill"; # kills the active window
"${mod}+s" = ''exec --no-startup-id ${rofi} -run-command "/bin/sh -i -c '{cmd}'" -show combi''; # opens rofi
"${mod}+Tab" = "exec --no-startup-id ${rofi} -show window";
# "${mod}+p" = ''mode "resize"'';
"${mod}+o" = "exec swaylock"; # locks the session, requiring password to unlock.
### move focus
"${mod}+Left" = "focus left";
"${mod}+Down" = "focus down";
"${mod}+Up" = "focus up";
"${mod}+Right" = "focus right";
### move windows
"${mod}+Shift+Left" = "move left";
"${mod}+Shift+Down" = "move down";
"${mod}+Shift+Up" = "move up";
"${mod}+Shift+Right" = "move right";
"${mod}+Shift+m" = "split h"; # Horizontal split
"${mod}+Shift+v" = "split v"; # Vertical Split
"${mod}+t" = "fullscreen toggle"; # fullscreen
"${mod}+r" = "layout stacking";
"${mod}+w" = "layout tabbed";
"${mod}+e" = "layout toggle split";
"${mod}+Shift+Space" = "floating toggle";
"${mod}+Space" = "focus mode_toggle"; # change focus between tiling and floating
"${mod}+a" = "focus parent";
"${mod}+Shift+a" = "focus child";
"${mod}+Shift+d" = "reload";
### moves user around
"${mod}+1" = "workspace number 1";
"${mod}+2" = "workspace number 2";
"${mod}+3" = "workspace number 3";
"${mod}+4" = "workspace number 4";
"${mod}+5" = "workspace number 5";
"${mod}+6" = "workspace number 6";
"${mod}+7" = "workspace number 7";
"${mod}+8" = "workspace number 8";
"${mod}+9" = "workspace number 9";
"${mod}+0" = "workspace number 10";
### moves containers around
"${mod}+Shift+1" = "move container to workspace number 1";
"${mod}+Shift+2" = "move container to workspace number 2";
"${mod}+Shift+3" = "move container to workspace number 3";
"${mod}+Shift+4" = "move container to workspace number 4";
"${mod}+Shift+5" = "move container to workspace number 5";
"${mod}+Shift+6" = "move container to workspace number 6";
"${mod}+Shift+7" = "move container to workspace number 7";
"${mod}+Shift+8" = "move container to workspace number 8";
"${mod}+Shift+9" = "move container to workspace number 9";
"${mod}+Shift+0" = "move container to workspace number 10";
};
### TODO : Resize mode and automatic floating
assigns = {
"1:" = [{title = "^Signal$|Discord$|FluffyChat$";}];
"2:main" = [{title = "VSCodium$";}];
"3:browsing" = [{title = "LibreWolf$";}];
"4:misc" = [];
"5:5" = [];
"6:6" = [];
"7:7" = [];
"8:8" = [];
"9:9" = [];
"0:audio" = [{title = "pwvucontrol$|noisetorch$";}];
};
/*
# commented out as they're automagically handled by stylix
colors = {
# should probably use a let ... in ... here
background = "#212121";
focused = {
border = "#2b83a6";
background = "#2b83a6";
text = "#ffffff";
indicator = "#dddddd";
childBorder = "#2b83a6";
}; };
focusedInactive = { terminal = "terminator";
border = "#212121";
keybindings = let
mod = config.wayland.windowManager.sway.config.modifier;
term = config.wayland.windowManager.sway.config.terminal;
rofi = "rofi";
in {
"${mod}+Return" = "exec ${term}"; # opens a terminal window
"${mod}+Shift+q" = "kill"; # kills the active window
"${mod}+s" = ''exec --no-startup-id ${rofi} -run-command "/bin/sh -i -c '{cmd}'" -show combi''; # opens rofi
"${mod}+Tab" = "exec --no-startup-id ${rofi} -show window";
# "${mod}+p" = ''mode "resize"'';
"${mod}+o" = "exec swaylock"; # locks the session, requiring password to unlock.
### move focus
"${mod}+Left" = "focus left";
"${mod}+Down" = "focus down";
"${mod}+Up" = "focus up";
"${mod}+Right" = "focus right";
### move windows
"${mod}+Shift+Left" = "move left";
"${mod}+Shift+Down" = "move down";
"${mod}+Shift+Up" = "move up";
"${mod}+Shift+Right" = "move right";
"${mod}+Shift+m" = "split h"; # Horizontal split
"${mod}+Shift+v" = "split v"; # Vertical Split
"${mod}+t" = "fullscreen toggle"; # fullscreen
"${mod}+r" = "layout stacking";
"${mod}+w" = "layout tabbed";
"${mod}+e" = "layout toggle split";
"${mod}+Shift+Space" = "floating toggle";
"${mod}+Space" = "focus mode_toggle"; # change focus between tiling and floating
"${mod}+a" = "focus parent";
"${mod}+Shift+a" = "focus child";
"${mod}+Shift+d" = "reload";
### moves user around
"${mod}+1" = "workspace number 1";
"${mod}+2" = "workspace number 2";
"${mod}+3" = "workspace number 3";
"${mod}+4" = "workspace number 4";
"${mod}+5" = "workspace number 5";
"${mod}+6" = "workspace number 6";
"${mod}+7" = "workspace number 7";
"${mod}+8" = "workspace number 8";
"${mod}+9" = "workspace number 9";
"${mod}+0" = "workspace number 10";
### moves containers around
"${mod}+Shift+1" = "move container to workspace number 1";
"${mod}+Shift+2" = "move container to workspace number 2";
"${mod}+Shift+3" = "move container to workspace number 3";
"${mod}+Shift+4" = "move container to workspace number 4";
"${mod}+Shift+5" = "move container to workspace number 5";
"${mod}+Shift+6" = "move container to workspace number 6";
"${mod}+Shift+7" = "move container to workspace number 7";
"${mod}+Shift+8" = "move container to workspace number 8";
"${mod}+Shift+9" = "move container to workspace number 9";
"${mod}+Shift+0" = "move container to workspace number 10";
};
### TODO : Resize mode and automatic floating
assigns = {
"1:" = [{title = "^Signal$|Discord$|FluffyChat$";}];
"2:main" = [{title = "VSCodium$";}];
"3:browsing" = [{title = "LibreWolf$";}];
"4:misc" = [];
"5:5" = [];
"6:6" = [];
"7:7" = [];
"8:8" = [];
"9:9" = [];
"0:audio" = [{title = "pwvucontrol$|noisetorch$";}];
};
/*
# commented out as they're automagically handled by stylix
colors = {
# should probably use a let ... in ... here
background = "#212121"; background = "#212121";
text = "#86888c"; focused = {
indicator = "#292d2e"; border = "#2b83a6";
childBorder = "#5a5a5a"; background = "#2b83a6";
}; text = "#ffffff";
unfocused = { indicator = "#dddddd";
border = "#212121"; childBorder = "#2b83a6";
background = "#212121"; };
text = "#86888c"; focusedInactive = {
indicator = "#292d2e"; border = "#212121";
childBorder = "#5a5a5a"; background = "#212121";
}; text = "#86888c";
urgent = { indicator = "#292d2e";
border = "#d64e4e"; childBorder = "#5a5a5a";
background = "#d64e4e"; };
text = "#ffffff"; unfocused = {
indicator = "#d64e4e"; border = "#212121";
childBorder = "#d64e4e"; background = "#212121";
}; text = "#86888c";
placeholder = { indicator = "#292d2e";
border = "#212121"; childBorder = "#5a5a5a";
background = "#0c0c0c"; };
text = "#ffffff"; urgent = {
indicator = "#212121"; border = "#d64e4e";
childBorder = "#262626"; background = "#d64e4e";
}; text = "#ffffff";
}; indicator = "#d64e4e";
*/ childBorder = "#d64e4e";
};
bars = [ placeholder = {
{ border = "#212121";
statusCommand = "\${pkgs.swayrbar}/bin/swayrbar"; background = "#0c0c0c";
position = "bottom"; text = "#ffffff";
trayOutput = "primary"; indicator = "#212121";
# separatorSymbol = "·"; childBorder = "#262626";
workspaceButtons = true;
workspaceNumbers = false;
colors = {
# again, should probably use a let ... in ... statement here.
background = "#212121";
statusline = "#dddddd";
separator = "#666666";
focusedWorkspace = {
border = "#2b83a6";
background = "#2b83a6";
text = "#ffffff";
};
activeWorkspace = {
border = "#212121";
background = "#212121";
text = "#ffffff";
};
inactiveWorkspace = {
border = "#212121";
background = "#212121";
text = "#86888c";
};
urgentWorkspace = {
border = "#d64e4e";
background = "#d64e4e";
text = "#ffffff";
};
bindingMode = {
border = "#229c56";
background = "#229c56";
text = "#ffffff";
};
}; };
}
];
output = {
DP-3 = {
mode = "3440x1440@144.000Hz";
}; };
}; */
input = { bars = [
"10429:2335:UGTABLET_11.6_inch_PenDisplay" = { {
map_to_output = ''"UGD Artist 12 pro 0x19201012"''; statusCommand = "\${pkgs.swayrbar}/bin/swayrbar";
position = "bottom";
trayOutput = "primary";
# separatorSymbol = "·";
workspaceButtons = true;
workspaceNumbers = false;
colors = {
# again, should probably use a let ... in ... statement here.
background = "#212121";
statusline = "#dddddd";
separator = "#666666";
focusedWorkspace = {
border = "#2b83a6";
background = "#2b83a6";
text = "#ffffff";
};
activeWorkspace = {
border = "#212121";
background = "#212121";
text = "#ffffff";
};
inactiveWorkspace = {
border = "#212121";
background = "#212121";
text = "#86888c";
};
urgentWorkspace = {
border = "#d64e4e";
background = "#d64e4e";
text = "#ffffff";
};
bindingMode = {
border = "#229c56";
background = "#229c56";
text = "#ffffff";
};
};
}
];
output = {
DP-3 = {
mode = "3440x1440@144.000Hz";
};
}; };
"type:keyboard" = {
xkb_layout = "ro,us(colemak_dh)"; input = {
xkb_options = "grp:rctrl_toggle"; "10429:2335:UGTABLET_11.6_inch_PenDisplay" = {
map_to_output = ''"UGD Artist 12 pro 0x19201012"'';
};
"type:keyboard" = {
xkb_layout = "ro,us(colemak_dh)";
xkb_options = "grp:rctrl_toggle";
};
}; };
};
gaps = { gaps = {
smartGaps = true; smartGaps = true;
inner = 8; inner = 8;
outer = 2; outer = 2;
}; };
workspaceAutoBackAndForth = true; workspaceAutoBackAndForth = true;
workspaceLayout = "tabbed"; workspaceLayout = "tabbed";
};
}; };
}; }
}
) )
]; ];
} }

View file

@ -23,7 +23,7 @@
systeme systeme
xstring xstring
tikzfill # dependency of tcolorbox tikzfill # dependency of tcolorbox
pdfcol # pdfcol #
pdfcolfoot # dependencies of tcolorbox pdfcolfoot # dependencies of tcolorbox
tcolorbox # fancy color environments !!! tcolorbox # fancy color environments !!!
; ;