bertof/nix-dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove with antipatter and aggregate google-chrome override

Browse source
This commit is contained in:
Filippo Berto 2023-02-15 10:41:52 +01:00
parent a4b29ec259
commit 93b0ccf178
No known key found for this signature in database
GPG key ID: FE98AE5EC52B1056
46 changed files with 264 additions and 452 deletions
Download patch file Download diff file Expand all files Collapse all files

3
baldur/configuration.nix
View file

@ -20,7 +20,8 @@ with lib; {
environment = {
pathsToLink = [ "/share/zsh" ];
systemPackages = with pkgs; [ helix kitty tmux vim ];
systemPackages =
builtins.attrValues { inherit (pkgs) helix kitty tmux vim; };
};
i18n.defaultLocale = "it_IT.UTF-8";

2
baldur/hm.nix
View file

@ -5,7 +5,7 @@
layout = "it";
options = [ "terminate:ctrl_alt_bksp" "compose:rctrl" "grp:menu_toggle" ];
};
packages = with pkgs; [ nix-prefetch-scripts ];
packages = builtins.attrValues { inherit (pkgs) nix-prefetch-scripts; };
};
imports = [
../hm_modules/__basic.nix

14
custom/default.nix
View file

@ -1,11 +1,11 @@
{ pkgs ? import <nixos> { inherit system; }, system ? builtins.currentSystem }:
let
self = with pkgs; {
clipedit = callPackage ./clipedit { };
cocktail-bar-cli = callPackage ./cocktail-bar-cli { };
lockscreen = callPackage ./lockscreen { };
sddm-theme-clairvoyance = callPackage ./sddm-theme-clairvoyance { };
update-background = callPackage ./update-background { };
vital-synth = callPackage ./vital-synth { };
self = {
clipedit = pkgs.callPackage ./clipedit { };
cocktail-bar-cli = pkgs.callPackage ./cocktail-bar-cli { };
lockscreen = pkgs.callPackage ./lockscreen { };
sddm-theme-clairvoyance = pkgs.callPackage ./sddm-theme-clairvoyance { };
update-background = pkgs.callPackage ./update-background { };
vital-synth = pkgs.callPackage ./vital-synth { };
};
in self

3
flake.nix
View file

@ -87,6 +87,9 @@
self.callPackage ./custom/sddm-theme-clairvoyance {
wallpaper = ./wallpapers/comfy_waves.jpg;
};
google-chrome = self.google-chrome.override {
commandLineArgs = [ "--password-store=gnome" "--force-dark-mode" ];
};
})
];

49
freya/configuration.nix
View file

@ -15,7 +15,7 @@ with lib; {
environment = {
pathsToLink = [ "/share/zsh" ];
systemPackages = with pkgs; [ kakoune tmux vim ];
systemPackages = builtins.attrValues { inherit (pkgs) kakoune tmux vim; };
};
i18n.defaultLocale = "it_IT.UTF-8";
@ -59,7 +59,7 @@ with lib; {
};
# bazarr = { enable = true; openFirewall = true; group = "users"; };
# blueman.enable = true;
dbus.packages = with pkgs; [ dconf ];
dbus.packages = [ pkgs.dconf ];
# fail2ban = { enable = true; bantime-increment.enable = true; };
gnome.gnome-keyring.enable = true;
# gvfs = { enable = true; package = mkForce pkgs.gnome3.gvfs; };
@ -235,51 +235,6 @@ with lib; {
# };
# };
# systemd.packages = with pkgs; [ syncthing ];
# systemd.services =
# let
# common = {
# documentation = [ "man:syncthing(1)" ];
# startLimitIntervalSec = 60;
# startLimitBurst = 4;
# after = [ "network.target" ];
# environment = { STNORESTART = "yes"; STNOUPGRADE = "yes"; };
# wantedBy = [ "default.target" ];
# serviceConfig = {
# Restart = "on-failure";
# RestartSec = 1;
# SuccessExitStatus = "3 4";
# RestartForceExitStatus = "3 4";
# Group = config.ids.gids.users;
# MemoryDenyWriteExecute = true;
# NoNewPrivileges = true;
# PrivateDevices = true;
# PrivateMounts = true;
# PrivateTmp = true;
# PrivateUsers = true;
# ProtectControlGroups = true;
# ProtectHostname = true;
# ProtectKernelModules = true;
# ProtectKernelTunables = true;
# RestrictNamespaces = true;
# RestrictRealtime = true;
# RestrictSUIDSGID = true;
# CapabilityBoundingSet = [ "~CAP_SYS_PTRACE" "~CAP_SYS_ADMIN" "~CAP_SETGID" "~CAP_SETUID" "~CAP_SETPCAP" "~CAP_SYS_TIME" "~CAP_KILL" ];
# };
# };
# in
# {
# syncthing-bertof = recursiveUpdate common {
# description = "Syncthing service bertof";
# serviceConfig = { User = "bertof"; ExecStart = "${pkgs.syncthing}/bin/syncthing -no-browser -gui-address=0.0.0.0:8384 -home=/mnt/raid0/bertof/Syncthing/.config"; };
# };
# syncthing-tiziano = recursiveUpdate common {
# description = "Syncthing service tiziano";
# serviceConfig = { User = "tiziano"; ExecStart = "${pkgs.syncthing}/bin/syncthing -no-browser -gui-address=0.0.0.0:8385 -home=/mnt/raid0/tiziano/Syncthing/.config"; };
# };
# };
security.sudo.extraConfig = ''
Defaults pwfeedback
'';

16
freya/hm.nix
View file

@ -24,22 +24,16 @@
layout = "it";
options = [ "terminate:ctrl_alt_bksp" "compose:rctrl" ];
};
packages = with pkgs; [
file
htop
neofetch
nix-prefetch-scripts
ripgrep
wget
xclip
yq
];
packages = builtins.attrValues {
inherit (pkgs)
file htop neofetch nix-prefetch-scripts ripgrep wget xclip yq;
};
};
imports = [
../hm_modules/__basic.nix
../hm_modules/configurations.nix
../hm_modules/fonts.nix
# ../hm_modules/fonts.nix
../hm_modules/bash.nix
../hm_modules/bat.nix
../hm_modules/bottom.nix

22
hm_modules/__basic.nix
View file

@ -1,23 +1,11 @@
{ pkgs, ... }: {
home = {
language.base = "it_IT.UTF-8";
packages = with pkgs; [
fd
file
htop
lf
mmv-go
neofetch
nixos-option
pv
ripgrep
unrar
unzip
wget
xclip
yq
zip
];
packages = builtins.attrValues {
inherit (pkgs)
fd file htop lf mmv-go neofetch nixos-option pv ripgrep unrar unzip wget
xclip yq zip;
};
};
imports = [

4
hm_modules/biblio.nix
View file

@ -1 +1,3 @@
{ pkgs, ... }: { home.packages = with pkgs; [ calibre mangal ]; }
{ pkgs, ... }: {
home.packages = builtins.attrValues { inherit (pkgs) calibre mangal; };
}

2
hm_modules/blender.nix
View file

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

2
hm_modules/blender_nvidia.nix
View file

@ -1,4 +1,4 @@
{ pkgs, ... }: {
home.packages = with pkgs; [ (blender.override { cudaSupport = true; }) ];
home.packages = [ (pkgs.blender.override { cudaSupport = true; }) ];
}

2
hm_modules/bottom.nix
View file

@ -1,7 +1,7 @@
{ pkgs, ... }:
let tomlGenerate = (pkgs.formats.toml { }).generate "bottom-toml";
in {
home.packages = with pkgs; [ bottom ];
home.packages = [ pkgs.bottom ];
xdg.configFile."bottom/bottom.toml".source = tomlGenerate {
"flags" = {
"left_legend" = true;

2
hm_modules/bspwm.nix
View file

@ -43,5 +43,5 @@ in {
network-manager-applet.enable = true;
blueman-applet.enable = true;
};
home.packages = with pkgs; [ blueman ];
home.packages = [ pkgs.blueman ];
}

16
hm_modules/development/cpp.nix
View file

@ -1,12 +1,8 @@
{ pkgs, config, lib, ... }: {
home.packages = with pkgs;
[
] ++ lib.optionals config.programs.helix.enable [
clang-tools # C, CPP
cmake-language-server # CMAKE
] ++ lib.optionals config.programs.kakoune.enable [
clang-tools # C, CPP
cmake-language-server # CMAKE
];
home.packages =
lib.optionals config.programs.helix.enable builtins.attrValues {
inherit (pkgs) clang-tools cmake-language-server;
} ++ lib.optionals config.programs.kakoune.enable builtins.attrValues {
inherit (pkgs) clang-tools cmake-language-server;
};
}

17
hm_modules/development/data.nix
View file

@ -1,11 +1,10 @@
{ config, pkgs, lib, ... }: {
home.packages = with pkgs;
lib.optionals config.programs.helix.enable [
nodePackages.vscode-langservers-extracted # CSS, HTML, JSON, SCSS
yaml-language-server # YAML
taplo-cli # TOML
] ++ lib.optionals config.programs.kakoune.enable [
nodePackages.vscode-langservers-extracted # CSS, HTML, JSON, SCSS
yaml-language-server # YAML
];
home.packages =
lib.optionals config.programs.helix.enable builtins.attrValues {
inherit (pkgs) yaml-language-server taplo-cli;
inherit (pkgs.nodePackages) vscode-langservers-extracted;
} ++ lib.optionals config.programs.kakoune.enable builtins.attrValues {
inherit (pkgs) yaml-language-server;
inherit (pkgs.nodePackages) vscode-langservers-extracted;
};
}

9
hm_modules/development/docker.nix
View file

@ -1,8 +1,9 @@
{ pkgs, config, lib, ... }: {
home.packages = with pkgs;
[ docker-compose docker-machine ]
++ lib.optionals config.programs.helix.enable
[ nodePackages.dockerfile-language-server-nodejs ];
home.packages =
builtins.attrValues { inherit (pkgs) docker-compose docker-machine; }
++ lib.optionals config.programs.helix.enable builtins.attrValues {
inherit (pkgs.nodePackages) dockerfile-language-server-nodejs;
};
home.shellAliases = {
"dkcd" = "docker-compose down";
"dkc" = "docker-compose";

5
hm_modules/development/go.nix
View file

@ -4,7 +4,6 @@
goPath = ".go";
};
home.packages = with pkgs;
lib.optionals config.programs.helix.enable [ gopls ]
++ (lib.optionals config.programs.kakoune.enable [ gopls ]);
home.packages = lib.optionals config.programs.helix.enable [ pkgs.gopls ]
++ (lib.optionals config.programs.kakoune.enable [ pkgs.gopls ]);
}

13
hm_modules/development/javascript.nix
View file

@ -1,11 +1,10 @@
{ pkgs, lib, config, ... }: {
home.packages = with pkgs;
[
] ++ lib.optionals config.programs.helix.enable
[ nodePackages.typescript-language-server ]
++ lib.optionals config.programs.kakoune.enable
[ nodePackages.typescript-language-server ];
home.packages =
lib.optionals config.programs.helix.enable builtins.attrValues {
inherit (pkgs.nodePackages) typescript-language-server;
} ++ lib.optionals config.programs.kakoune.enable builtins.attrValues {
inherit (pkgs.nodePackages) typescript-language-server;
};
programs.neovim.withNodeJs = true;
}

5
hm_modules/development/kubernetes.nix
View file

@ -1 +1,4 @@
{ pkgs, ... }: { home.packages = with pkgs; [ kubectl kubernetes-helm lens ]; }
{ pkgs, ... }: {
home.packages =
builtins.attrValues { inherit (pkgs) kubectl kubernetes-helm lens; };
}

17
hm_modules/development/latex.nix
View file

@ -1,13 +1,8 @@
{ pkgs, config, lib, ... }: {
home.packages = with pkgs;
[ bibtool texlive.combined.scheme-medium ]
++ lib.optionals config.programs.helix.enable [ texlab ]
++ lib.optionals config.programs.kakoune.enable [
texlab
aspell
aspellDicts.en
aspellDicts.en-computers
aspellDicts.en-science
aspellDicts.it
];
home.packages = [ pkgs.bibtool pkgs.texlive.combined.scheme-medium ]
++ lib.optionals config.programs.helix.enable [ pkgs.texlab ]
++ lib.optionals config.programs.kakoune.enable (builtins.attrValues {
inherit (pkgs) texlab aspell;
inherit (pkgs.aspellDicts) en en-computers en-science it;
});
}

10
hm_modules/development/nix.nix
View file

@ -1,7 +1,7 @@
{ pkgs, config, lib, ... }: {
home.packages = with pkgs;
[ nixpkgs-fmt nixfmt nix-prefetch-scripts nix-review nix-tree ]
++ lib.optionals config.programs.helix.enable [ nil ]
++ lib.optionals config.programs.kakoune.enable [ rnix-lsp ];
programs.neovim.plugins = with pkgs.vimPlugins; [ vim-nix ];
home.packages = builtins.attrValues {
inherit (pkgs) nixpkgs-fmt nixfmt nix-prefetch-scripts nix-review nix-tree;
} ++ lib.optionals config.programs.helix.enable [ pkgs.nil ]
++ lib.optionals config.programs.kakoune.enable [ pkgs.rnix-lsp ];
programs.neovim.plugins = [ pkgs.vimPlugins.vim-nix ];
}

8
hm_modules/development/pycharm.nix
View file

@ -1,7 +1,7 @@
{ pkgs, ... }: {
home.packages = with pkgs; [
jetbrains.pycharm-professional
python3
home.packages = {
inherit (pkgs) python3;
inherit (pkgs.jetbrains) pycharm-professional;
# pypy3
];
};
}

20
hm_modules/development/python.nix
View file

@ -1,17 +1,9 @@
{ pkgs, lib, config, ... }: {
home.packages = with pkgs;
[ black ] ++ lib.optionals config.programs.helix.enable [
python3Packages.python-lsp-server # PYLSP
# python3Packages.pyls-mypy # MYPY # NOT UPDATED
python3Packages.pyls-flake8 # FLAKE8
# python3Packages.pyls-black # BLACK # NOT UPDATED
python3Packages.pyls-isort # ISORT
] ++ lib.optionals config.programs.kakoune.enable [
python3Packages.python-lsp-server # PYLSP
# python3Packages.pyls-mypy # MYPY # NOT UPDATED
python3Packages.pyls-flake8 # FLAKE8
# python3Packages.pyls-black # BLACK # NOT UPDATED
python3Packages.pyls-isort # ISORT
];
home.packages = [ pkgs.black ]
++ lib.optionals config.programs.helix.enable builtins.attrValues {
inherit (pkgs.python3Packages) python-lsp-server pyls-flake8 pyls-isort;
} ++ lib.optionals config.programs.kakoune.enable builtins.attrValues {
inherit (pkgs.python3Packages) python-lsp-server pyls-flake8 pyls-isort;
};
programs.neovim.withPython3 = true;
}

50
hm_modules/development/rust.nix
View file

@ -1,35 +1,19 @@
{ pkgs, lib, config, ... }: {
home.packages = with pkgs;
[
bacon
cargo
# cargo-about
cargo-audit
# cargo-auditable
cargo-criterion
cargo-deadlinks
# cargo-deny
# cargo-deps
cargo-expand
# cargo-feature
cargo-flamegraph
cargo-fuzz
cargo-hack
cargo-hakari
cargo-inspect
cargo-modules
cargo-outdated
cargo-profiler
cargo-release
cargo-show-asm
cargo-spellcheck
cargo-tarpaulin
cargo-udeps
cargo-watch
cargo-workspaces
clippy
rustc
rustfmt
] ++ lib.optionals config.programs.helix.enable [ lldb rust-analyzer ]
++ lib.optionals config.programs.kakoune.enable [ rust-analyzer ];
home.packages = builtins.attrValues {
inherit (pkgs)
bacon cargo cargo-audit cargo-criterion cargo-deadlinks cargo-expand
cargo-flamegraph cargo-fuzz cargo-hack cargo-hakari cargo-inspect
cargo-modules cargo-outdated cargo-profiler cargo-release cargo-show-asm
cargo-spellcheck cargo-tarpaulin cargo-udeps cargo-watch cargo-workspaces
clippy rustc rustfmt;
# cargo-about
# cargo-auditable
# cargo-deny
# cargo-deps
# cargo-feature
} ++ lib.optionals config.programs.helix.enable
(builtins.attrValues { inherit (pkgs) lldb rust-analyzer; })
++ lib.optionals config.programs.kakoune.enable
(builtins.attrValues { inherit (pkgs) rust-analyzer; });
}

5
hm_modules/dunst.nix
View file

@ -2,7 +2,10 @@
with pkgs.lib.nix-rice;
let strPalette = palette.toRGBHex pkgs.rice.colorPalette;
in {
home.packages = with pkgs; [ dunst rice.font.normal.package ];
home.packages = builtins.attrValues {
inherit (pkgs) dunst;
inherit (pkgs.rice.font.normal) package;
};
services.dunst = {
enable = true;
iconTheme = {

15
hm_modules/fonts.nix
View file

@ -1,12 +1,9 @@
{ pkgs, ... }: {
fonts.fontconfig = { enable = true; };
home.packages = with pkgs; [
dejavu_fonts
noto-fonts
noto-fonts-extra
noto-fonts-cjk-sans
font-awesome
corefonts # Microsoft fonts
vistafonts
];
home.packages = builtins.attrValues {
inherit (pkgs)
dejavu_fonts noto-fonts noto-fonts-extra noto-fonts-cjk-sans font-awesome
corefonts # Microsoft fonts
vistafonts;
};
}

3
hm_modules/git.nix
View file

@ -118,5 +118,6 @@ in {
};
programs.bash.shellAliases = shellAliases;
programs.zsh.shellAliases = shellAliases;
home.packages = with pkgs; [ gh git-secret glab meld ];
home.packages =
builtins.attrValues { inherit (pkgs) gh git-secret glab meld; };
}

8
hm_modules/helix.nix
View file

@ -33,10 +33,10 @@ in {
EDITOR = "hx";
VISUAL = "hx";
};
home.packages = with pkgs; [
nil # Nix language server
desktopItem
];
home.packages = builtins.attrValues {
inherit (pkgs) nil; # Nix language server
inherit desktopItem;
};
programs.helix = {
enable = true;
package = pkgs.unstable_pkgs.helix;

60
hm_modules/kakoune.nix
View file

@ -30,36 +30,36 @@ let
set-face global BufferPadding default,default
'';
packages = with pkgs; [
editorconfig-core-c
(pkgs.makeDesktopItem {
name = "Kakoune";
exec = "kak %F";
icon = "kakoune";
desktopName = "Kakoune";
comment = "Kakoune text editor";
terminal = true;
categories = [ "Development" ];
mimeTypes = [
"text/english"
"text/plain"
"text/x-makefile"
"text/x-c++hdr"
"text/x-c++src"
"text/x-chdr"
"text/x-csrc"
"text/x-java"
"text/x-moc"
"text/x-pascal"
"text/x-tcl"
"text/x-tex"
"application/x-shellscript"
"text/x-c"
"text/x-c++"
];
})
];
desktopItem = pkgs.makeDesktopItem {
name = "Kakoune";
exec = "kak %F";
icon = "kakoune";
desktopName = "Kakoune";
comment = "Kakoune text editor";
terminal = true;
categories = [ "Development" ];
mimeTypes = [
"text/english"
"text/plain"
"text/x-makefile"
"text/x-c++hdr"
"text/x-c++src"
"text/x-chdr"
"text/x-csrc"
"text/x-java"
"text/x-moc"
"text/x-pascal"
"text/x-tcl"
"text/x-tex"
"application/x-shellscript"
"text/x-c"
"text/x-c++"
];
};
packages = builtins.attrValues {
inherit (pkgs) editorconfig-core-c;
inherit desktopItem;
};
in {
programs.bash.shellAliases = { k = "kak"; };

2
hm_modules/kicad.nix
View file

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

2
hm_modules/nautilus.nix
View file

@ -1 +1 @@
{ pkgs, ... }: { home.packages = with pkgs; [ gnome.nautilus ]; }
{ pkgs, ... }: { home.packages = [ pkgs.gnome.nautilus ]; }

12
hm_modules/office.nix
View file

@ -1,10 +1,6 @@
{ pkgs, ... }: {
home.packages = with pkgs; [
libreoffice-fresh
# onlyoffice-bin
hunspellDicts.en_GB-large
hunspellDicts.en_US-large
hunspellDicts.it_IT
hunspell.bin
];
home.packages = builtins.attrValues {
inherit (pkgs) hunspell libreoffice-fresh;
inherit (pkgs.hunspellDicts) en_GB-large en_US-large it_IT;
};
}

10
hm_modules/polybar.nix
View file

@ -110,15 +110,13 @@ let
ramp = [ "▂" "▃" "▄" "▅" "▆" "▇" ];
in {
home.packages = with pkgs; [
pkgs.rice.font.monospace.package
home.packages = builtins.attrValues {
inherit (pkgs) noto-fonts material-design-icons noto-fonts-cjk-sans;
# emojione
# noto-fonts-emoji
noto-fonts
material-design-icons
# font-awesome
noto-fonts-cjk-sans
];
inherit (pkgs.rice.font.monospace) package;
};
services.polybar = {
enable = true;
package = pkgs.polybarFull;

49
hm_modules/pro_audio.nix
View file

@ -14,38 +14,25 @@ let
VST3_PATH = "$HOME/.vst3:${userLibFolder}/vst3:${systemLibFolder}/vst3";
};
in {
home.packages = with pkgs; [
carla
rnnoise
ardour
# zrythm
breeze-icons
mixxx
home.packages = builtins.attrValues {
inherit (pkgs)
carla rnnoise ardour
# zrythm
breeze-icons mixxx
# Plugins
artyFX
autotalent
boops
cardinal
geonkick
# helm
lsp-plugins
# noise-repellent
samplv1
# speech-denoiser
# stochas
# sunvox
surge
giada
surge-XT
talentedhack
# tunefish
vocproc
x42-plugins
zita-at1
zynaddsubfx
zyn-fusion
];
# Plugins
artyFX autotalent boops cardinal geonkick
# helm
lsp-plugins
# noise-repellent
samplv1
# speech-denoiser
# stochas
# sunvox
surge giada surge-XT talentedhack
# tunefish
vocproc x42-plugins zita-at1 zynaddsubfx zyn-fusion;
};
home.sessionVariables = variables;
}

11
hm_modules/research.nix
View file

@ -1,7 +1,8 @@
{ pkgs, ... }: {
home.packages = with pkgs;
[
# unstable.mendeley # Reference manager
unstable_pkgs.obsidian # Note manager
];
home.packages = builtins.attrValues {
inherit (pkgs.unstable_pkgs)
# mendeley # Reference manager
obsidian # Note manager
;
};
}

11
hm_modules/rofi.nix
View file

@ -1,11 +1,8 @@
{ pkgs, ... }: {
home.packages = with pkgs; [
rofimoji
rofi-bluetooth
rofi-power-menu
rofi-vpn
];
home.packages = builtins.attrValues {
inherit (pkgs) rofimoji rofi-bluetooth rofi-power-menu rofi-vpn;
};
programs.rofi = {
enable = true;
@ -13,7 +10,7 @@
font = "${pkgs.rice.font.monospace.name} ${
toString pkgs.rice.font.monospace.size
}";
plugins = with pkgs; [ rofi-calc ];
plugins = [ pkgs.rofi-calc ];
extraConfig = { modi = "drun,run,ssh,window,calc"; };
terminal = "kitty";
theme = "onedark";

28
hm_modules/security.nix
View file

@ -1,20 +1,18 @@
{ pkgs, ... }: {
home.packages = with pkgs; [
# RECOGNITION
nmap
home.packages = builtins.attrValues {
inherit (pkgs)
nmap # RECOGNITION
# WEB
# altair
# burpsuite
httpie
# WEB
httpie
# altair
# burpsuite
# REVERSING
bintools
ghidra-bin
radare2
# cutter
bintools ghidra-bin radare2 # REVERSING
# cutter
# INFRASTRUCTURE
# cocktail-bar-cli
];
# INFRASTRUCTURE
# cocktail-bar-cli
;
};
}

15
hm_modules/sxhkd.nix
View file

@ -3,14 +3,11 @@
# ./nautilus.nix
# ./thunar.nix
];
home.packages = with pkgs; [
gnome.gnome-screenshot
lockscreen
terminator
bsp-layout
bc # required by bsp-layout
clipedit
];
home.packages = builtins.attrValues {
inherit (pkgs)
# bc
bsp-layout clipedit lockscreen terminator; # required by bsp-layout
};
services.sxhkd = let
primaryTerminal = "kitty";
secondaryTerminal = "terminator";
@ -41,7 +38,7 @@
enable = true;
keybindings = {
"alt + Tab" = "rofi -show window";
"Print" = "gnome-screenshot";
"Print" = "${pkgs.gnome.gnome-screenshot}/bin/gnome-screenshot";
"super + alt + {h,j,k,l}" =
"bspc node -z {left -20 0,bottom 0 20,top 0 -20,right 20 0}";
"super + alt + m" = "lockscreen";

2
hm_modules/terminator.nix
View file

@ -27,7 +27,7 @@ let
bright.white
];
in {
home.packages = with pkgs; [ terminator ];
home.packages = [ pkgs.terminator ];
xdg.configFile."terminator/config".text = with strPalette; ''
[global_config]

3
hm_modules/zsh.nix
View file

@ -1,5 +1,6 @@
{ pkgs, ... }: {
home.packages = with pkgs; [ nix-zsh-completions zsh-completions ];
home.packages =
builtins.attrValues { inherit (pkgs) nix-zsh-completions zsh-completions; };
programs.zsh = {
enable = true;

13
loki/configuration.nix
View file

@ -16,7 +16,7 @@ with lib; {
environment = {
pathsToLink = [ "/share/zsh" ];
systemPackages = with pkgs; [ kakoune tmux vim ];
systemPackages = builtins.attrValues { inherit (pkgs) kakoune tmux vim; };
};
hardware = {
@ -33,12 +33,9 @@ with lib; {
opengl = {
enable = true;
extraPackages = with pkgs; [
intel-media-driver
libvdpau-va-gl
vaapiIntel
vaapiVdpau
];
extraPackages = builtins.attrValues {
inherit (pkgs) intel-media-driver libvdpau-va-gl vaapiIntel vaapiVdpau;
};
};
bluetooth.enable = true;
@ -89,7 +86,7 @@ with lib; {
group = "users";
};
blueman.enable = true;
dbus.packages = with pkgs; [ dconf ];
dbus.packages = [ pkgs.dconf ];
fail2ban = {
enable = true;
bantime-increment.enable = true;

2
nixos_modules/big_data.nix
View file

@ -297,7 +297,7 @@ in {
users.users.bertof.extraGroups = [ "hadoop" ];
systemd.services.spark-history = {
path = with pkgs; [ procps openssh nettools ];
path = builtins.attrValues { inherit (pkgs) procps openssh nettools; };
description = "spark history service.";
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];

2
nixos_modules/pentablet.nix
View file

@ -6,7 +6,7 @@
'';
# XP-Pen tablet driver
environment.systemPackages = with pkgs; [ xp-pen-deco-01-v2-driver ];
environment.systemPackages = [ pkgs.xp-pen-deco-01-v2-driver ];
# hardware.opentabletdriver = {
# enable = true;

25
odin/common_configuration.nix
View file

@ -17,12 +17,9 @@ with lib; {
enable = true;
driSupport = true;
driSupport32Bit = true;
extraPackages = with pkgs; [
intel-media-driver
vaapiIntel
vaapiVdpau
libvdpau-va-gl
];
extraPackages = builtins.attrValues {
inherit (pkgs) intel-media-driver vaapiIntel vaapiVdpau libvdpau-va-gl;
};
};
# Use same ACPI identifier as Dell Ubuntu
@ -77,11 +74,10 @@ with lib; {
# Enable CUPS to print documents.
services.printing = {
enable = true;
drivers = with pkgs;
[
gutenprint
# cups-kyocera
];
drivers = [
pkgs.gutenprint
# pkgs.cups-kyocera
];
};
services.keybase.enable = true;
@ -133,7 +129,8 @@ with lib; {
# List packages installed in system profile. To search, run:
# $ nix search wget
environment.systemPackages = with pkgs; [ tmux helix vim git ntfs3g ];
environment.systemPackages =
builtins.attrValues { inherit (pkgs) tmux helix vim git ntfs3g; };
# Some programs need SUID wrappers, can be configured further or are
# started in user sessions.
@ -195,7 +192,7 @@ with lib; {
};
services.dbus = {
packages = with pkgs; [ dconf ];
packages = [ pkgs.dconf ];
implementation = "broker";
};
services.gnome.gnome-keyring.enable = true;
@ -267,7 +264,7 @@ with lib; {
nixpkgs.config = {
allowUnfree = true;
packageOverrides = pkgs: {
steam = pkgs.steam.override { extraPkgs = pkgs: with pkgs; [ icu ]; };
steam = pkgs.steam.override { extraPkgs = pkgs: [ pkgs.icu ]; };
};
};

69
odin/hm.nix
View file

@ -6,68 +6,35 @@
variant = ",,colemak";
options = [ "terminate:ctrl_alt_bksp" "compose:rctrl" "grp:menu_toggle" ];
};
packages = with pkgs; [
arandr
authy
bitwarden
cava
discord
dmenu
droidcam
easyeffects
packages = builtins.attrValues {
inherit (pkgs)
# element-desktop # matrix client
evince
# evolution
# freecad
gallery-dl
gnome.eog
gnome.file-roller
# gnome.geary
# gnome.gnome-boxes
# gnome.gnome-calendar
gnome.gnome-font-viewer
gnome.gnome-screenshot
# gnome.gnome-sound-recorder
gnome.gnome-system-monitor
# gnome.seahorse
gnome.totem
# (google-chrome.override { commandLineArgs = [ "--password-store=gnome" "--force-dark-mode" ]; })
gucharmap
handbrake
httpie
inkscape
jetbrains.datagrip
krita
# lutris
meld
# minecraft
# mycrypto
openvpn
p7zip
pavucontrol
# pcmanfm
pentablet-driver
postman
procps
# pulseaudio
pulseaudio
# retroarchFull
shotwell
# signal-desktop
skypeforlinux
# slack
spotify
tdesktop
teams
thunderbird
transmission-gtk
virt-manager
virt-viewer
# wineFull
wireguard-tools
xournalpp
zoom-us
];
arandr authy bitwarden cava discord dmenu droidcam easyeffects evince
gallery-dl krita meld openvpn p7zip pavucontrol pentablet-driver postman
procps pulseaudio shotwell skypeforlinux spotify tdesktop teams
thunderbird transmission-gtk virt-manager virt-viewer wireguard-tools
xournalpp zoom-us gucharmap handbrake httpie inkscape;
inherit (pkgs.gnome)
# geary
# gnome-boxes
# gnome-calendar
# gnome-sound-recorder
# seahorse
eog file-roller gnome-font-viewer gnome-screenshot gnome-system-monitor
totem;
inherit (pkgs.jetbrains) datagrip;
};
};
services = { gnome-keyring.enable = true; };
@ -107,7 +74,7 @@
../hm_modules/dwarf-fortress.nix
../hm_modules/easyeffects.nix
../hm_modules/firefox.nix
../hm_modules/fonts.nix
# ../hm_modules/fonts.nix
# ../hm_modules/gnome_shell.nix
# ../hm_modules/grobi.nix
../hm_modules/gtk_theme.nix

6
thor/configuration.nix
View file

@ -28,7 +28,7 @@ with lib; {
environment = {
pathsToLink = [ "/share/zsh" ];
systemPackages = with pkgs; [ kakoune tmux vim ];
systemPackages = builtins.attrValues { inherit (pkgs) kakoune tmux vim; };
};
hardware = {
@ -95,7 +95,7 @@ with lib; {
# daemon.enable = true;
# updater.enable = true;
# };
dbus.packages = with pkgs; [ dconf ];
dbus.packages = [ pkgs.dconf ];
gnome.gnome-keyring.enable = true;
gvfs = {
enable = true;
@ -202,7 +202,7 @@ with lib; {
nixpkgs.config = {
allowUnfree = true;
packageOverrides = pkgs: {
steam = pkgs.steam.override { extraPkgs = pkgs: with pkgs; [ icu ]; };
steam = pkgs.steam.override { extraPkgs = pkgs: [ pkgs.icu ]; };
};
# cudaSupport = true;
};

72
thor/hm.nix
View file

@ -6,72 +6,36 @@
variant = ",colemak,";
options = [ "terminate:ctrl_alt_bksp" "compose:rctrl" "grp:menu_toggle" ];
};
packages = with pkgs; [
arandr
authy
bitwarden
discord
dmenu
docker-compose
docker-machine
droidcam
easyeffects
packages = builtins.attrValues {
inherit (pkgs)
# electrum
# element-desktop # matrix client
evince
# evolution
filelight
# freecad
gallery-dl
gnome.eog
gnome.file-roller
# gnome.geary
# gnome.gnome-boxes
# gnome.gnome-calendar
gnome.gnome-font-viewer
gnome.gnome-screenshot
# gnome.gnome-sound-recorder
gnome.gnome-system-monitor
# gnome.seahorse
gnome.totem
# (google-chrome.override { commandLineArgs = [ "--password-store=gnome" "--force-dark-mode" ]; })
gucharmap
handbrake
httpie
inkscape
jetbrains.datagrip
krita
# lutris
meld
# minecraft
# mycrypto
openvpn
p7zip
pavucontrol
# pcmanfm
pcsx2
pentablet-driver
postman
procps
# pulseaudio
pulseaudio
retroarchFull
shotwell
# signal-desktop
skypeforlinux
# slack
spotify
tdesktop
teams
thunderbird
transmission-gtk
virt-manager
virt-viewer
# wineFull
wireguard-tools
xournalpp
zoom-us
];
arandr authy bitwarden discord dmenu docker-compose docker-machine
droidcam easyeffects evince filelight gallery-dl gucharmap handbrake
httpie inkscape krita meld openvpn p7zip pavucontrol pcsx2
pentablet-driver postman procps pulseaudio retroarchFull shotwell
skypeforlinux spotify tdesktop teams thunderbird transmission-gtk
virt-manager virt-viewer wireguard-tools xournalpp zoom-us;
inherit (pkgs.gnome)
# geary
# gnome-boxes
# gnome-calendar
# gnome-sound-recorder
# seahorse
eog file-roller gnome-font-viewer gnome-screenshot gnome-system-monitor
totem;
inherit (pkgs.jetbrains) datagrip;
};
};
services = { gnome-keyring.enable = true; };