removed stuff
This commit is contained in:
vali
parent
94b210a303
commit
ab4960e8c4
16 changed files with 69 additions and 773 deletions
|
|
@ -1,42 +0,0 @@
|
|||
{ config, lib, inputs, pkgs, ... }:
|
||||
with lib; let
|
||||
username = config.modules.other.system.username;
|
||||
cfg = config.modules.programs.alacritty;
|
||||
in {
|
||||
options.modules.programs.alacritty = {
|
||||
enable = mkEnableOption "alacritty";
|
||||
catppuccin = mkEnableOption "catppuccin";
|
||||
opacity = mkOption {
|
||||
description = "opacity of alacritty";
|
||||
type = types.number;
|
||||
default = 1.0;
|
||||
};
|
||||
blur = mkOption {
|
||||
description = "blur of alacritty";
|
||||
type = types.bool;
|
||||
default = false;
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
home-manager.users.${username} = {
|
||||
programs.alacritty.enable = true;
|
||||
|
||||
programs.alacritty.settings = {
|
||||
window = {
|
||||
blur = cfg.blur;
|
||||
opacity = cfg.opacity;
|
||||
};
|
||||
|
||||
colors = mkIf cfg.catppuccin {
|
||||
primary = {
|
||||
background = "#1e1e2e";
|
||||
foreground = "#cdd6f4";
|
||||
dim_foreground = "#7f849c";
|
||||
bright_foreground = "#cdd6f4";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -5,15 +5,11 @@ _: {
|
|||
./gtk.nix
|
||||
./mpv.nix
|
||||
./qt.nix
|
||||
./schizofox.nix
|
||||
./zathura.nix
|
||||
./obs.nix
|
||||
./foot.nix
|
||||
./rofi.nix
|
||||
./WM
|
||||
./kitty.nix
|
||||
./vivado.nix
|
||||
./alacritty.nix
|
||||
./firefox.nix
|
||||
./steam.nix
|
||||
./minecraft.nix
|
||||
|
|
|
|||
|
|
@ -1,121 +0,0 @@
|
|||
{
|
||||
config,
|
||||
inputs,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: with lib; let
|
||||
cfg = config.modules.programs.foot;
|
||||
username = config.modules.other.system.username;
|
||||
in {
|
||||
options.modules.programs.foot = {
|
||||
enable = mkEnableOption "foot";
|
||||
server = mkEnableOption "foot server mode";
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
environment.sessionVariables = {
|
||||
TERM = "foot";
|
||||
};
|
||||
home-manager.users.${username} = {
|
||||
programs.foot = {
|
||||
enable = true;
|
||||
package = inputs.nixpkgs-wayland.packages.${pkgs.system}.foot;
|
||||
server.enable = cfg.server;
|
||||
settings = {
|
||||
main = {
|
||||
term = "foot";
|
||||
app-id = "foot";
|
||||
title = "foot";
|
||||
locked-title = "no";
|
||||
|
||||
font = "JetBrains Mono Nerd Font:size=16";
|
||||
line-height = 20;
|
||||
letter-spacing = 0;
|
||||
horizontal-letter-offset = 0;
|
||||
vertical-letter-offset = -0.75;
|
||||
box-drawings-uses-font-glyphs = "no";
|
||||
dpi-aware = "no";
|
||||
|
||||
initial-window-size-chars = "104x36";
|
||||
initial-window-mode = "windowed";
|
||||
pad = "5x5 center";
|
||||
resize-delay-ms = 100;
|
||||
|
||||
notify = "${pkgs.libnotify}/bin/notify-send -a \${app-id} -i \${app-id} \${title} \${body}";
|
||||
|
||||
bold-text-in-bright = "no";
|
||||
word-delimiters = ",│`|:\"'()[]{}<>";
|
||||
selection-target = "primary";
|
||||
};
|
||||
bell = {
|
||||
urgent = "yes";
|
||||
notify = "yes";
|
||||
command = "notify-send bell";
|
||||
command-focused = "no";
|
||||
};
|
||||
scrollback = {
|
||||
lines = 100000;
|
||||
multiplier = 10.0;
|
||||
indicator-position = "relative";
|
||||
indicator-format = "line";
|
||||
};
|
||||
url = {
|
||||
launch = "${pkgs.xdg-utils}/bin/xdg-open \${url}";
|
||||
label-letters = "sadfjklewcmpgh";
|
||||
osc8-underline = "always";
|
||||
protocols = "http, https, ftp, ftps, file, gemini, gopher, irc, ircs";
|
||||
uri-characters = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_.,~:;/?#@!$&%*+=\"'()[]";
|
||||
};
|
||||
cursor = {
|
||||
style = "block";
|
||||
blink = "no";
|
||||
};
|
||||
mouse = {
|
||||
hide-when-typing = "yes";
|
||||
alternate-scroll-mode = "yes";
|
||||
};
|
||||
colors = {
|
||||
alpha = 0.85;
|
||||
foreground = "cdd6f4"; # Text
|
||||
background = "1e1e2e"; # Base
|
||||
regular0 = "45475a"; # Surface 1
|
||||
regular1 = "f38ba8"; # red
|
||||
regular2 = "a6e3a1"; # green
|
||||
regular3 = "f9e2af"; # yellow
|
||||
regular4 = "89b4fa"; # blue
|
||||
regular5 = "f5c2e7"; # pink
|
||||
regular6 = "94e2d5"; # teal
|
||||
regular7 = "bac2de"; # Subtext 1
|
||||
bright0 = "585b70"; # Surface 2
|
||||
bright1 = "f38ba8"; # red
|
||||
bright2 = "a6e3a1"; # green
|
||||
bright3 = "f9e2af"; # yellow
|
||||
bright4 = "89b4fa"; # blue
|
||||
bright5 = "f5c2e7"; # pink
|
||||
bright6 = "94e2d5"; # teal
|
||||
bright7 = "a6adc8"; # Subtext 0
|
||||
};
|
||||
csd = {
|
||||
preferred = "server";
|
||||
};
|
||||
key-bindings = {
|
||||
show-urls-launch = "Control+Shift+u";
|
||||
unicode-input = "Control+Shift+i";
|
||||
};
|
||||
mouse-bindings = {
|
||||
selection-override-modifiers = "Shift";
|
||||
primary-paste = "BTN_MIDDLE";
|
||||
select-begin = "BTN_LEFT";
|
||||
select-begin-block = "Control+BTN_LEFT";
|
||||
select-extend = "BTN_RIGHT";
|
||||
select-extend-character-wise = "Control+BTN_RIGHT";
|
||||
select-word = "BTN_LEFT-2";
|
||||
select-word-whitespace = "Control+BTN_LEFT-2";
|
||||
#select-row = "BTN_LEFT-3";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -1,6 +1,7 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: with lib; let
|
||||
cfg = config.modules.themes.gtk;
|
||||
|
|
@ -13,33 +14,25 @@ in {
|
|||
description = "gtk theme name";
|
||||
type = types.str;
|
||||
};
|
||||
variant = mkOption {
|
||||
description = "gtk theme variant";
|
||||
type = types.str;
|
||||
};
|
||||
accentColour = mkOption {
|
||||
description = "accent colour for gtk theme";
|
||||
type = types.str;
|
||||
};
|
||||
package = mkOption {
|
||||
description = "gtk theme package";
|
||||
type = types.package;
|
||||
};
|
||||
iconTheme = mkOption {
|
||||
description = "gtk icon theme";
|
||||
type = with types; submodule {
|
||||
options = {
|
||||
name = mkOption {
|
||||
description = "gtk icon theme name";
|
||||
type = str;
|
||||
};
|
||||
package = mkOption {
|
||||
description = "gtk icon theme package";
|
||||
type = package;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
# iconTheme = mkOption {
|
||||
# description = "gtk icon theme";
|
||||
# type = with types; submodule {
|
||||
# options = {
|
||||
# name = mkOption {
|
||||
# description = "gtk icon theme name";
|
||||
# type = str;
|
||||
# };
|
||||
# package = mkOption {
|
||||
# description = "gtk icon theme package";
|
||||
# type = package;
|
||||
# };
|
||||
# };
|
||||
# };
|
||||
# };
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
|
|
@ -47,19 +40,18 @@ in {
|
|||
gtk = {
|
||||
enable = true;
|
||||
theme = {
|
||||
inherit (cfg) name package;
|
||||
};
|
||||
iconTheme = {
|
||||
inherit (cfg.iconTheme) name package;
|
||||
};
|
||||
gtk2 = {
|
||||
configLocation = "${hmCfg.xdg.configHome}/gtk-2.0/gtkrc";
|
||||
# inherit (cfg) name package;
|
||||
package = pkgs.materia-theme;
|
||||
name = "Materia-dark";
|
||||
};
|
||||
# iconTheme = {
|
||||
# inherit (cfg.iconTheme) name package;
|
||||
# };
|
||||
};
|
||||
home.sessionVariables = {
|
||||
GTK_THEME = cfg.name;
|
||||
GTK_USE_PORTAL = "1";
|
||||
};
|
||||
# home.sessionVariables = {
|
||||
# GTK_THEME = cfg.name;
|
||||
# GTK_USE_PORTAL = "1";
|
||||
# };
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,22 +0,0 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
with lib; let
|
||||
cfg = config.modules.programs.obs;
|
||||
username = config.modules.other.system.username;
|
||||
in {
|
||||
options.modules.programs.obs.enable = mkEnableOption "obs";
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
home-manager.users.${username} = {
|
||||
programs.obs-studio = {
|
||||
enable = true;
|
||||
plugins = with pkgs.obs-studio-plugins; [
|
||||
wlrobs
|
||||
obs-backgroundremoval
|
||||
obs-pipewire-audio-capture
|
||||
];
|
||||
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
}
|
||||
|
|
@ -4,19 +4,10 @@ with lib;
|
|||
let
|
||||
username = config.modules.other.system.username;
|
||||
cfg = config.modules.programs.rofi;
|
||||
in
|
||||
{
|
||||
in {
|
||||
options.modules.programs.rofi.enable = mkEnableOption "rofi";
|
||||
options.modules.other.system.wayland = mkOption {
|
||||
type = types.bool;
|
||||
description = "Does this system use wayland?";
|
||||
default = false;
|
||||
}; #FIXME: move this to the (hopefully then) refactored options directory
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
environment.systemPackages = with pkgs; [
|
||||
(if config.modules.other.system.wayland then rofi-wayland else rofi)
|
||||
];
|
||||
environment.systemPackages = with pkgs; [ rofi ];
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,87 +0,0 @@
|
|||
{ config, inputs, lib, ... }:
|
||||
with lib; let
|
||||
cfg = config.modules.programs.schizofox;
|
||||
username = config.modules.other.system.username;
|
||||
in {
|
||||
options.modules.programs.schizofox = {
|
||||
enable = mkEnableOption "schizofox";
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
home-manager.users.${username} = {
|
||||
imports = [ inputs.schizofox.homeManagerModule ];
|
||||
programs.schizofox = {
|
||||
enable = true;
|
||||
|
||||
theme = {
|
||||
colors = {
|
||||
background-darker = "181825";
|
||||
background = "1e1e2e";
|
||||
foreground = "cdd6f4";
|
||||
};
|
||||
|
||||
font = "Lexend";
|
||||
|
||||
extraUserChrome = ''
|
||||
body {
|
||||
color: red !important;
|
||||
}
|
||||
'';
|
||||
};
|
||||
|
||||
search = {
|
||||
defaultSearchEngine = "Brave";
|
||||
removeEngines = ["Google" "Bing" "Amazon.com" "eBay" "Twitter" "Wikipedia"];
|
||||
searxUrl = "https://searx.be";
|
||||
searxQuery = "https://searx.be/search?q={searchTerms}&categories=general";
|
||||
addEngines = [
|
||||
{
|
||||
Name = "NixOS Packages";
|
||||
Description = "NixOS Unstable package serach";
|
||||
Alias = "!np";
|
||||
Method = "GET";
|
||||
URLTemplate = "https://search.nixos.org/packages?channel=unstable&query={searchTerms}";
|
||||
}
|
||||
{
|
||||
Name = "Home Manager Options";
|
||||
Description = "Home Manager option search";
|
||||
Alias = "!hm";
|
||||
Method = "GET";
|
||||
URLTemplate = "https://mipmip.github.io/home-manager-option-search?query={searchTerms}";
|
||||
}
|
||||
|
||||
];
|
||||
};
|
||||
|
||||
security = {
|
||||
sanitizeOnShutdown = false;
|
||||
sandbox = true;
|
||||
userAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:106.0) Gecko/20100101 Firefox/106.0";
|
||||
};
|
||||
|
||||
misc = {
|
||||
drmFix = true;
|
||||
disableWebgl = false;
|
||||
};
|
||||
|
||||
extensions = {
|
||||
simplefox.enable = true;
|
||||
darkreader.enable = true;
|
||||
|
||||
extraExtensions = {
|
||||
};
|
||||
};
|
||||
|
||||
bookmarks = [
|
||||
{
|
||||
Title = "Example";
|
||||
URL = "https://example.com";
|
||||
Favicon = "https://example.com/favicon.ico";
|
||||
Placement = "toolbar";
|
||||
Folder = "FolderName";
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -1,57 +0,0 @@
|
|||
{ config, lib, pkgs, ...}:
|
||||
|
||||
with lib;
|
||||
let
|
||||
vivado-desktop-symbol = pkgs.makeDesktopItem {
|
||||
name = "vivado-2022_2";
|
||||
desktopName = "Vivado";
|
||||
exec = "${pkgs.nur.repos.lschuermann.vivado-2022_2}/bin/vivado";
|
||||
};
|
||||
cfg = config.modules.programs.vivado;
|
||||
username = config.modules.other.system.username;
|
||||
in
|
||||
{
|
||||
options.modules.programs.vivado.enable = mkEnableOption "vivado";
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
environment.systemPackages = with pkgs; [
|
||||
# this propietary software is huge, but I need it for
|
||||
# university
|
||||
pkgs.nur.repos.lschuermann.vivado-2022_2
|
||||
vivado-desktop-symbol
|
||||
];
|
||||
|
||||
|
||||
# Create udev rules. Reference: https://blog.kotatsu.dev/posts/2021-09-14-vivado-on-nixos/
|
||||
services.udev.packages = [
|
||||
(pkgs.writeTextFile {
|
||||
name = "xilinx-dilligent-usb-udev";
|
||||
destination = "/etc/udev/rules.d/52-xilinx-digilent-usb.rules";
|
||||
text = ''
|
||||
ATTR{idVendor}=="1443", MODE:="666"
|
||||
ACTION=="add", ATTR{idVendor}=="0403", ATTR{manufacturer}=="Digilent", MODE:="666"
|
||||
'';
|
||||
})
|
||||
(pkgs.writeTextFile {
|
||||
name = "xilinx-pcusb-udev";
|
||||
destination = "/etc/udev/rules.d/52-xilinx-pcusb.rules";
|
||||
text = ''
|
||||
ATTR{idVendor}=="03fd", ATTR{idProduct}=="0008", MODE="666"
|
||||
ATTR{idVendor}=="03fd", ATTR{idProduct}=="0007", MODE="666"
|
||||
ATTR{idVendor}=="03fd", ATTR{idProduct}=="0009", MODE="666"
|
||||
ATTR{idVendor}=="03fd", ATTR{idProduct}=="000d", MODE="666"
|
||||
ATTR{idVendor}=="03fd", ATTR{idProduct}=="000f", MODE="666"
|
||||
ATTR{idVendor}=="03fd", ATTR{idProduct}=="0013", MODE="666"
|
||||
ATTR{idVendor}=="03fd", ATTR{idProduct}=="0015", MODE="666"
|
||||
'';
|
||||
})
|
||||
(pkgs.writeTextFile {
|
||||
name = "xilinx-ftdi-usb-udev";
|
||||
destination = "/etc/udev/rules.d/52-xilinx-ftdi-usb.rules";
|
||||
text = ''
|
||||
ACTION=="add", ATTR{idVendor}=="0403", ATTR{manufacturer}=="Xilinx", MODE:="666"
|
||||
'';
|
||||
})
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
@ -3,7 +3,6 @@ _: {
|
|||
./home-manager.nix
|
||||
./system.nix
|
||||
./xdg.nix
|
||||
./displaymanager.nix
|
||||
];
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,13 +0,0 @@
|
|||
{pkgs, lib, config, ...}:
|
||||
with lib; let
|
||||
cfg = config.modules.programs.displaymanager;
|
||||
in {
|
||||
options.modules.programs.displaymanager.enable = mkEnableOption "displaymanager";
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
services.xserver.displayManager = {
|
||||
gdm.enable = true;
|
||||
defaultSession = "none+i3";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -1,11 +1,9 @@
|
|||
{
|
||||
pkgs, config,
|
||||
...
|
||||
}: let
|
||||
{ pkgs, config, ... }:
|
||||
let
|
||||
username = config.modules.other.system.username;
|
||||
hmCfg = config.home-manager.users.${username};
|
||||
|
||||
primary_browser = "schizofox.desktop";
|
||||
primary_browser = "librewolf.desktop";
|
||||
mail_client = "thunderbird.desktop";
|
||||
file_manager = "pcmanfm.desktop";
|
||||
media_player = "mpv.desktop";
|
||||
|
|
@ -14,46 +12,21 @@
|
|||
terminal = "kitty.desktop";
|
||||
in {
|
||||
|
||||
/* environment.sessionVariables = {
|
||||
CARGO_HOME = "${hmCfg.xdg.dataHome}/cargo";
|
||||
GOPATH = "${hmCfg.xdg.dataHome}/go";
|
||||
GNUPGHOME = "${hmCfg.xdg.dataHome}/gnupg";
|
||||
GRADLE_USER_HOME = "${hmCfg.xdg.dataHome}/gradle";
|
||||
HISTFILE = "${hmCfg.xdg.stateHome}/bash/history";
|
||||
MYSQL_HISTFILE = "${hmCfg.xdg.stateHome}/mysql/history";
|
||||
NPM_CONFIG_USERCONFIG = "${hmCfg.xdg.configHome}/npm/npmrc";
|
||||
NUGET_PACKAGES = "${hmCfg.xdg.cacheHome}/NuGetPackages";
|
||||
JAVA_OPTIONS = "-Djava.util.prefs.userRoot=${hmCfg.xdg.configHome}/java";
|
||||
PARALLEL_HOME = "${hmCfg.xdg.configHome}/parallel";
|
||||
PYTHONSTARTUP = "${hmCfg.xdg.configHome}/python/pythonrc";
|
||||
RUSTUP_HOME = "${hmCfg.xdg.dataHome}/rustup";
|
||||
WINEPREFIX = "${hmCfg.xdg.dataHome}/wine";
|
||||
XAUTHORITY = "\$XDG_RUNTIME_DIR/Xauthority";
|
||||
};
|
||||
*/
|
||||
xdg.portal = {
|
||||
enable = true;
|
||||
config = {
|
||||
common.default = "gtk";
|
||||
};
|
||||
extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
|
||||
config.common.default = "gtk";
|
||||
};
|
||||
environment.sessionVariables = {
|
||||
TERMINAL = "${terminal}";
|
||||
};
|
||||
|
||||
home-manager.users.${username} = {
|
||||
xdg.configFile."npm/npmrc".text = ''
|
||||
prefix=${hmCfg.xdg.dataHome}/npm
|
||||
cache=${hmCfg.xdg.cacheHome}/npm
|
||||
tmp=\$XDG_RUNTIME_DIR/npm
|
||||
init-module=${hmCfg.xdg.configHome}/npm/config/npm-init.js
|
||||
'';
|
||||
|
||||
xdg = {
|
||||
cacheHome = "${hmCfg.home.homeDirectory}/.cache";
|
||||
configHome = "${hmCfg.home.homeDirectory}/.config";
|
||||
dataHome = "${hmCfg.home.homeDirectory}/.local/share";
|
||||
stateHome = "${hmCfg.home.homeDirectory}/.local/state";
|
||||
# cacheHome = "${hmCfg.home.homeDirectory}/.cache";
|
||||
# configHome = "${hmCfg.home.homeDirectory}/.config";
|
||||
# dataHome = "${hmCfg.home.homeDirectory}/.local/share";
|
||||
# stateHome = "${hmCfg.home.homeDirectory}/.local/state";
|
||||
mimeApps = {
|
||||
enable = true;
|
||||
defaultApplications = {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue