Merge branch 'feature/rework'
This commit is contained in:
commit
adce187343
157 changed files with 628 additions and 839 deletions
1
.envrc
1
.envrc
|
|
@ -1,2 +1 @@
|
|||
use flake
|
||||
eval "$shellHook"
|
||||
|
|
|
|||
|
|
@ -1,30 +0,0 @@
|
|||
{ pkgs, ... }: {
|
||||
home = {
|
||||
language.base = "it_IT.UTF-8";
|
||||
keyboard = {
|
||||
layout = "it";
|
||||
options = [ "terminate:ctrl_alt_bksp" "compose:rctrl" "grp:menu_toggle" ];
|
||||
};
|
||||
packages = builtins.attrValues { inherit (pkgs) nix-prefetch-scripts; };
|
||||
};
|
||||
imports = [
|
||||
../hm_modules/__basic.nix
|
||||
|
||||
# ../hm_modules/development/cpp.nix
|
||||
# ../hm_modules/development/data.nix
|
||||
# ../hm_modules/development/go.nix
|
||||
# ../hm_modules/development/javascript.nix
|
||||
# ../hm_modules/development/latex.nix
|
||||
# ../hm_modules/development/python.nix
|
||||
# ../hm_modules/development/rust.nix
|
||||
|
||||
# ../hm_modules/fonts.nix
|
||||
../hm_modules/helix.nix
|
||||
# ../hm_modules/kitty.nix
|
||||
# ../hm_modules/lf.nix
|
||||
# ../hm_modules/megasync.nix
|
||||
# ../hm_modules/noti.nix
|
||||
];
|
||||
|
||||
home.stateVersion = "22.05";
|
||||
}
|
||||
|
|
@ -1,97 +0,0 @@
|
|||
# text
|
||||
# set-face global title rgb:bac5d8,default+b
|
||||
# set-face global header rgb:e6e6e6,default
|
||||
# set-face global bold rgb:e6e6e6,default+b
|
||||
# set-face global italic rgb:d6d6d6,default+i
|
||||
# set-face global mono rgb:b8b8b8,rgb:1f1f1f
|
||||
# set-face global block rgb:b8b8b8,rgb:1f1f1f
|
||||
# set-face global link rgb:e6e6e6,default
|
||||
# set-face global bullet rgb:e6e6e6,default
|
||||
# set-face global list rgb:c7c7c7,default
|
||||
|
||||
set-face global value rgb:b48ead,default
|
||||
set-face global type rgb:8fbcbb,default
|
||||
set-face global identifier rgb:88c0d0,default
|
||||
set-face global string rgb:a3be8c,default
|
||||
set-face global error rgb:BF616A,default
|
||||
set-face global keyword rgb:81a1c1,default
|
||||
set-face global operator rgb:c7c7c7,default
|
||||
set-face global attribute rgb:5e81ac,default
|
||||
set-face global comment rgb:4c566a,default
|
||||
set-face global meta rgb:ebcb8b,default
|
||||
|
||||
set-face global Default rgb:eceff4,rgb:2e3440
|
||||
# default colors
|
||||
|
||||
set-face global PrimarySelection rgb:2e3440,rgb:e5e9f0
|
||||
# main selection face for every selected character except the cursor
|
||||
|
||||
set-face global SecondarySelection rgb:eceff4,rgb:434c5e
|
||||
# secondary selection face for every selected character except the cursor
|
||||
|
||||
set-face global PrimaryCursor rgb:2e3440,rgb:ebcb8b
|
||||
# cursor of the primary selection
|
||||
|
||||
set-face global SecondaryCursor rgb:2e3440,rgb:d8dee9
|
||||
# cursor of the secondary selection
|
||||
|
||||
# set-face global PrimaryCursorEol
|
||||
# cursor of the primary selection when it lies on and end of line character
|
||||
|
||||
# set-face global SecondaryCursorEol
|
||||
# cursor of the secondary selection when it lies on and end of line character
|
||||
|
||||
set-face global MenuForeground rgb:d8dee9,rgb:4c566a
|
||||
# face for the selected element in menus
|
||||
|
||||
set-face global MenuBackground default,rgb:3b4252
|
||||
# face for the not selected elements in menus
|
||||
|
||||
set-face global MenuInfo default,rgb:3b4252
|
||||
# face for additional information for elements in menus
|
||||
|
||||
set-face global Information rgb:2e3440,rgb:88c0d0
|
||||
# face for the informations windows and information messages
|
||||
|
||||
# set-face global Error
|
||||
# face of error messages
|
||||
|
||||
set-face global StatusLine rgb:e5e9f0,rgb:3b4252
|
||||
# face used for the status line
|
||||
|
||||
set-face global StatusLineMode rgb:5e81ac,rgb:3b4252
|
||||
# face used for the current mode except the normal mode
|
||||
|
||||
set-face global StatusLineInfo rgb:5e81ac,rgb:3b4252
|
||||
# face used for special information
|
||||
|
||||
set-face global StatusLineValue rgb:5e81ac,rgb:3b4252
|
||||
# face used for special values (numeric prefixes, registers, etc.)
|
||||
|
||||
set-face global StatusCursor rgb:2e3440,rgb:ebcb8b
|
||||
# face used for the status line cursor
|
||||
|
||||
set-face global Prompt rgb:88c0d0,rgb:3b4252
|
||||
# face used prompt displayed on the status line
|
||||
|
||||
set-face global BufferPadding default,default
|
||||
# face applied on the ~ characters that follow the last line of a buffer
|
||||
|
||||
# set-face global Builtin highlighters faces
|
||||
|
||||
# The following faces are used by builtin highlighters if enabled.
|
||||
|
||||
# set-face global LineNumbers
|
||||
# face used by the number-lines highlighter
|
||||
|
||||
# set-face global LineNumberCursor
|
||||
# face used to highlight the line number of the main selection
|
||||
|
||||
# set-face global LineNumbersWrapped
|
||||
# face used to highlight the line number of wrapped lines
|
||||
|
||||
# set-face global MatchingChar
|
||||
# face used by the show-matching highlighter
|
||||
|
||||
# set-face global Whitespace
|
||||
# face used by the show-whitespaces highlighter
|
||||
|
|
@ -1,89 +0,0 @@
|
|||
* {
|
||||
nord0: #2e3440;
|
||||
nord1: #3b4252;
|
||||
nord2: #434c5e;
|
||||
nord3: #4c566a;
|
||||
nord4: #d8dee9;
|
||||
nord5: #e5e9f0;
|
||||
nord6: #eceff4;
|
||||
nord7: #8fbcbb;
|
||||
nord8: #88c0d0;
|
||||
nord9: #81a1c1;
|
||||
nord10: #5e81ac;
|
||||
nord11: #bf616a;
|
||||
nord12: #d08770;
|
||||
nord13: #ebcb8b;
|
||||
nord14: #a3be8c;
|
||||
nord15: #b48ead;
|
||||
|
||||
background-color: @nord1;
|
||||
border: 0px;
|
||||
margin: 0px;
|
||||
padding: 0px;
|
||||
spacing: 0px;
|
||||
text-color: @nord4;
|
||||
}
|
||||
#inputbar {
|
||||
text-color: @nord3;
|
||||
padding: 6px;
|
||||
margin: 0px 0px 2px;
|
||||
children: [ entry ];
|
||||
}
|
||||
#entry {
|
||||
background-color: @nord3;
|
||||
text-color: @nord4;
|
||||
padding: 5px;
|
||||
}
|
||||
#message {
|
||||
border: 0px 0px 1px;
|
||||
border-color: @nord3;
|
||||
padding: 0px 0px 6px 7px;
|
||||
}
|
||||
#listview {
|
||||
lines: 10;
|
||||
padding: 2px 0px 0px;
|
||||
scrollbar: true;
|
||||
}
|
||||
#element {
|
||||
padding: 0px 0px 0px 7px;
|
||||
margin: 0px 0px 5px 0px;
|
||||
text-color: @nord4;
|
||||
}
|
||||
#element.normal.normal {
|
||||
text-color: @nord4;
|
||||
}
|
||||
#element.normal.urgent {
|
||||
text-color: @nord11;
|
||||
}
|
||||
#element.normal.active {
|
||||
text-color: @nord10;
|
||||
}
|
||||
#element.alternate.normal {
|
||||
text-color: @nord4;
|
||||
}
|
||||
#element.alternate.urgent {
|
||||
text-color: @nord11;
|
||||
}
|
||||
#element.alternate.active {
|
||||
text-color: @nord10;
|
||||
}
|
||||
#element.selected.normal {
|
||||
background-color: @nord8;
|
||||
text-color: @nord1;
|
||||
}
|
||||
#element.selected.urgent {
|
||||
background-color: @nord11;
|
||||
text-color: @nord4;
|
||||
}
|
||||
#element.selected.active {
|
||||
background-color: @nord10;
|
||||
text-color: @nord4;
|
||||
}
|
||||
#scrollbar {
|
||||
handle-color: @nord3;
|
||||
handle-width: 0.50em;
|
||||
}
|
||||
#button.selected {
|
||||
background-color: @nord8;
|
||||
text-color: @nord4;
|
||||
}
|
||||
|
|
@ -1,101 +0,0 @@
|
|||
/*
|
||||
* ROFI One Dark
|
||||
*
|
||||
* Based on OneDark.vim (https://github.com/joshdick/onedark.vim)
|
||||
*
|
||||
* Author: Benjamin Stauss
|
||||
* User: me-benni
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
* {
|
||||
black: #000000;
|
||||
red: #eb6e67;
|
||||
green: #95ee8f;
|
||||
yellow: #f8c456;
|
||||
blue: #6eaafb;
|
||||
mangenta: #d886f3;
|
||||
cyan: #6cdcf7;
|
||||
purple: #C678DF;
|
||||
emphasis: #50536b;
|
||||
text: #dfdfdf;
|
||||
text-alt: #b2b2b2;
|
||||
fg: #abb2bf;
|
||||
bg: #282c34;
|
||||
|
||||
spacing: 0;
|
||||
background-color: transparent;
|
||||
|
||||
font: "Knack Nerd Font 14";
|
||||
text-color: @text;
|
||||
}
|
||||
|
||||
window {
|
||||
transparency: "real";
|
||||
fullscreen: true;
|
||||
background-color: #282c34dd;
|
||||
}
|
||||
|
||||
mainbox {
|
||||
padding: 30% 30%;
|
||||
}
|
||||
|
||||
inputbar {
|
||||
margin: 0px 0px 20px 0px;
|
||||
children: [prompt, textbox-prompt-colon, entry, case-indicator];
|
||||
}
|
||||
|
||||
prompt {
|
||||
text-color: @blue;
|
||||
}
|
||||
|
||||
textbox-prompt-colon {
|
||||
expand: false;
|
||||
str: ":";
|
||||
text-color: @text-alt;
|
||||
}
|
||||
|
||||
entry {
|
||||
margin: 0px 10px;
|
||||
}
|
||||
|
||||
listview {
|
||||
spacing: 5px;
|
||||
dynamic: true;
|
||||
scrollbar: false;
|
||||
}
|
||||
|
||||
element {
|
||||
padding: 5px;
|
||||
text-color: @text-alt;
|
||||
highlight: bold #95ee8f; /* green */
|
||||
border-radius: 3px;
|
||||
}
|
||||
|
||||
element selected {
|
||||
background-color: @emphasis;
|
||||
text-color: @text;
|
||||
}
|
||||
|
||||
element urgent, element selected urgent {
|
||||
text-color: @red;
|
||||
}
|
||||
|
||||
element active, element selected active {
|
||||
text-color: @purple;
|
||||
}
|
||||
|
||||
message {
|
||||
padding: 5px;
|
||||
border-radius: 3px;
|
||||
background-color: @emphasis;
|
||||
border: 1px;
|
||||
border-color: @cyan;
|
||||
}
|
||||
|
||||
button selected {
|
||||
padding: 5px;
|
||||
border-radius: 3px;
|
||||
background-color: @emphasis;
|
||||
}
|
||||
191
flake.nix
191
flake.nix
|
|
@ -53,11 +53,7 @@
|
|||
checks = {
|
||||
pre-commit-check = pre-commit-hooks.lib.${system}.run {
|
||||
src = ./.;
|
||||
hooks = {
|
||||
deadnix.enable = true;
|
||||
nixpkgs-fmt.enable = true;
|
||||
statix.enable = true;
|
||||
};
|
||||
hooks = { deadnix.enable = true; nixpkgs-fmt.enable = true; statix.enable = true; };
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -110,50 +106,33 @@
|
|||
age.secrets.thor_wg_priv = { file = ./secrets/thor_wg_priv.age; };
|
||||
}
|
||||
|
||||
./nixos_modules/bertof_user.nix
|
||||
./modules/nixos/users/bertof.nix
|
||||
|
||||
# Some defaults
|
||||
./nixos_modules/fwupd.nix
|
||||
./nixos_modules/fstrim.nix
|
||||
./nixos_modules/btrfs-scrub.nix
|
||||
./nixos_modules/distributed.nix
|
||||
./nixos_modules/remote-deploy.nix
|
||||
./nixos_modules/extended-registry.nix
|
||||
./nixos_modules/automatic-garbage-collection.nix
|
||||
./nixos_modules/automatic-upgrade.nix
|
||||
./nixos_modules/zerotier.nix
|
||||
# Some basic defaults
|
||||
./modules/nixos/basics
|
||||
];
|
||||
|
||||
installerModules = [
|
||||
# Nix configuration
|
||||
nix_configuration
|
||||
|
||||
./nixos_modules/bertof_user.nix
|
||||
|
||||
./nixos_modules/distributed.nix
|
||||
./nixos_modules/remote-deploy.nix
|
||||
./nixos_modules/extended-registry.nix
|
||||
./nixos_modules/zerotier.nix
|
||||
./nixos_modules/installer.nix
|
||||
];
|
||||
installerModules = commonModules ++ [ ./modules/nixos/installer.nix ];
|
||||
|
||||
thorConfig = {
|
||||
nixosConfigurations = {
|
||||
thor = nixpkgs.lib.nixosSystem {
|
||||
system = "x86_64-linux";
|
||||
modules = commonModules ++ [
|
||||
./thor/hardware-configuration.nix
|
||||
./modules/nixos/server
|
||||
|
||||
./instances/thor/hardware-configuration.nix
|
||||
nixos-hardware.nixosModules.common-cpu-amd
|
||||
nixos-hardware.nixosModules.common-pc-ssd
|
||||
./thor/configuration.nix
|
||||
./instances/thor/configuration.nix
|
||||
|
||||
./nixos_modules/pro_audio.nix
|
||||
./nixos_modules/sesar.nix
|
||||
./nixos_modules/pentablet.nix
|
||||
./nixos_modules/steam-link.nix
|
||||
./nixos_modules/kdeconnect.nix
|
||||
./modules/nixos/pro_audio.nix
|
||||
./modules/nixos/sesar.nix
|
||||
./modules/nixos/pentablet.nix
|
||||
./modules/nixos/steam-link.nix
|
||||
./modules/nixos/kdeconnect.nix
|
||||
] ++ homeManagerModules ++ [
|
||||
{ home-manager.users.bertof = import ./thor/hm.nix; }
|
||||
{ home-manager.users.bertof = import ./instances/thor/hm.nix; }
|
||||
];
|
||||
};
|
||||
};
|
||||
|
|
@ -163,33 +142,35 @@
|
|||
nixosConfigurations =
|
||||
let
|
||||
odinCommonModules = [
|
||||
./modules/nixos/server
|
||||
|
||||
nixos-hardware.nixosModules.common-cpu-intel
|
||||
nixos-hardware.nixosModules.common-pc-laptop
|
||||
nixos-hardware.nixosModules.common-pc-laptop-ssd
|
||||
./odin/hardware-configuration.nix
|
||||
./odin/common_configuration.nix
|
||||
./instances/odin/hardware-configuration.nix
|
||||
./instances/odin/common_configuration.nix
|
||||
|
||||
./nixos_modules/pro_audio.nix
|
||||
./nixos_modules/sesar.nix
|
||||
./nixos_modules/pentablet.nix
|
||||
./nixos_modules/steam-link.nix
|
||||
./nixos_modules/kdeconnect.nix
|
||||
./nixos_modules/garage.nix
|
||||
./modules/nixos/pro_audio.nix
|
||||
./modules/nixos/sesar.nix
|
||||
./modules/nixos/pentablet.nix
|
||||
./modules/nixos/steam-link.nix
|
||||
./modules/nixos/kdeconnect.nix
|
||||
./modules/nixos/garage.nix
|
||||
] ++ homeManagerModules ++ [
|
||||
{ home-manager.users.bertof = import ./odin/hm.nix; }
|
||||
{ home-manager.users.bertof = import ./instances/odin/hm.nix; }
|
||||
];
|
||||
in
|
||||
rec {
|
||||
odin-nvidia = nixpkgs.lib.nixosSystem {
|
||||
system = "x86_64-linux";
|
||||
modules = commonModules ++ odinCommonModules
|
||||
++ [ ./odin/configuration-nvidia.nix ];
|
||||
++ [ ./instances/odin/configuration-nvidia.nix ];
|
||||
};
|
||||
|
||||
odin-intel = nixpkgs.lib.nixosSystem {
|
||||
system = "x86_64-linux";
|
||||
modules = commonModules ++ odinCommonModules
|
||||
++ [ ./odin/configuration-intel.nix ];
|
||||
++ [ ./instances/odin/configuration-intel.nix ];
|
||||
};
|
||||
|
||||
odin = odin-intel;
|
||||
|
|
@ -205,14 +186,15 @@
|
|||
({ lib, ... }: {
|
||||
boot.supportedFilesystems = lib.mkForce [ "btrfs" "reiserfs" "vfat" "f2fs" "xfs" "ntfs" "cifs" ];
|
||||
})
|
||||
./modules/nixos/server
|
||||
|
||||
./freya/hardware-configuration.nix
|
||||
./freya/configuration.nix
|
||||
./instances/freya/hardware-configuration.nix
|
||||
./instances/freya/configuration.nix
|
||||
|
||||
./nixos_modules/garage.nix
|
||||
./nixos_modules/nextcloud.nix
|
||||
./modules/nixos/garage.nix
|
||||
./modules/nixos/nextcloud.nix
|
||||
] ++ homeManagerModules ++ [
|
||||
{ home-manager.users.bertof = import ./freya/hm.nix; }
|
||||
{ home-manager.users.bertof = import ./instances/freya/hm.nix; }
|
||||
];
|
||||
};
|
||||
};
|
||||
|
|
@ -223,13 +205,14 @@
|
|||
baldur = nixpkgs.lib.nixosSystem {
|
||||
system = "x86_64-linux";
|
||||
modules = commonModules ++ [
|
||||
./modules/nixos/server
|
||||
# ./baldur/hardware-configuration.nix
|
||||
./baldur/configuration.nix
|
||||
./instances/baldur/configuration.nix
|
||||
"${nixpkgs}/nixos/modules/virtualisation/digital-ocean-config.nix"
|
||||
./nixos_modules/digitalocean.nix
|
||||
./nixos_modules/garage.nix
|
||||
./modules/nixos/digitalocean.nix
|
||||
./modules/nixos/garage.nix
|
||||
] ++ homeManagerModules ++ [
|
||||
{ home-manager.users.bertof = import ./baldur/hm.nix; }
|
||||
{ home-manager.users.bertof = import ./instances/baldur/hm.nix; }
|
||||
];
|
||||
};
|
||||
};
|
||||
|
|
@ -240,16 +223,18 @@
|
|||
loki = nixpkgs.lib.nixosSystem {
|
||||
system = "x86_64-linux";
|
||||
modules = commonModules ++ [
|
||||
./modules/nixos/server
|
||||
|
||||
nixos-hardware.nixosModules.common-cpu-intel
|
||||
nixos-hardware.nixosModules.common-pc-ssd
|
||||
./loki/hardware-configuration.nix
|
||||
./loki/configuration.nix
|
||||
./instances/loki/hardware-configuration.nix
|
||||
./instances/loki/configuration.nix
|
||||
|
||||
./nixos_modules/garage.nix
|
||||
./modules/nixos/garage.nix
|
||||
] ++ homeManagerModules ++ [
|
||||
{
|
||||
home-manager.users.bertof = import ./loki/hm.nix;
|
||||
home-manager.users.tiziano = import ./loki/hm_tiziano.nix;
|
||||
home-manager.users.bertof = import ./instances/loki/hm.nix;
|
||||
home-manager.users.tiziano = import ./instances/loki/hm_tiziano.nix;
|
||||
}
|
||||
];
|
||||
};
|
||||
|
|
@ -264,78 +249,24 @@
|
|||
|
||||
# Map nodes to Deploy-rs deployments
|
||||
deploy.nodes = {
|
||||
thor = {
|
||||
hostname = "thor.local";
|
||||
profiles.system = {
|
||||
user = "root";
|
||||
path = deploy-rs.lib.x86_64-linux.activate.nixos
|
||||
self.nixosConfigurations.thor;
|
||||
};
|
||||
};
|
||||
|
||||
odin = {
|
||||
hostname = "odin.local";
|
||||
profiles.system = {
|
||||
user = "root";
|
||||
path = deploy-rs.lib.x86_64-linux.activate.nixos
|
||||
self.nixosConfigurations.odin;
|
||||
};
|
||||
};
|
||||
|
||||
loki = {
|
||||
hostname = "loki.local";
|
||||
profiles.system = {
|
||||
user = "root";
|
||||
path = deploy-rs.lib.x86_64-linux.activate.nixos
|
||||
self.nixosConfigurations.loki;
|
||||
};
|
||||
};
|
||||
|
||||
baldur = {
|
||||
hostname = "baldur.bertof.net";
|
||||
profiles.system = {
|
||||
user = "root";
|
||||
path = deploy-rs.lib.x86_64-linux.activate.nixos
|
||||
self.nixosConfigurations.baldur;
|
||||
};
|
||||
};
|
||||
|
||||
freya = {
|
||||
hostname = "freya.local";
|
||||
profiles.system = {
|
||||
user = "root";
|
||||
path = deploy-rs.lib.aarch64-linux.activate.nixos
|
||||
self.nixosConfigurations.freya;
|
||||
};
|
||||
};
|
||||
thor = { hostname = "thor.local"; profiles.system = { user = "root"; path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.thor; }; };
|
||||
odin = { hostname = "odin.local"; profiles.system = { user = "root"; path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.odin; }; };
|
||||
loki = { hostname = "loki.local"; profiles.system = { user = "root"; path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.loki; }; };
|
||||
baldur = { hostname = "baldur.bertof.net"; profiles.system = { user = "root"; path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.baldur; }; };
|
||||
freya = { hostname = "freya.local"; profiles.system = { user = "root"; path = deploy-rs.lib.aarch64-linux.activate.nixos self.nixosConfigurations.freya; }; };
|
||||
};
|
||||
};
|
||||
|
||||
images = with flake-utils.lib;
|
||||
eachSystem [ system.x86_64-linux system.aarch64-linux ] (system: {
|
||||
packages = {
|
||||
# Installer ISO
|
||||
install-iso = nixos-generators.nixosGenerate {
|
||||
inherit system;
|
||||
modules = installerModules;
|
||||
format = "install-iso";
|
||||
};
|
||||
|
||||
# Aarch64 base image
|
||||
aarch64-base-image = nixos-generators.nixosGenerate {
|
||||
system = flake-utils.lib.system.aarch64-linux;
|
||||
modules = installerModules;
|
||||
format = "sd-aarch64";
|
||||
};
|
||||
|
||||
# Installer DigitalOcean
|
||||
do-image = nixos-generators.nixosGenerate {
|
||||
inherit system;
|
||||
modules = installerModules;
|
||||
format = "do";
|
||||
};
|
||||
};
|
||||
});
|
||||
images = with flake-utils.lib; eachSystem [ system.x86_64-linux system.aarch64-linux ] (system: {
|
||||
packages = {
|
||||
# Installer ISO
|
||||
install-iso = nixos-generators.nixosGenerate { inherit system; modules = installerModules; format = "install-iso"; };
|
||||
# Aarch64 base image
|
||||
aarch64-base-image = nixos-generators.nixosGenerate { system = flake-utils.lib.system.aarch64-linux; modules = installerModules; format = "sd-aarch64"; };
|
||||
# Installer DigitalOcean
|
||||
do-image = nixos-generators.nixosGenerate { inherit system; modules = installerModules; format = "do"; };
|
||||
};
|
||||
});
|
||||
|
||||
in
|
||||
builtins.foldl' nixpkgs.lib.recursiveUpdate { } [
|
||||
|
|
|
|||
|
|
@ -1,25 +0,0 @@
|
|||
{ pkgs, ... }: {
|
||||
|
||||
home.packages = builtins.attrValues {
|
||||
inherit (pkgs)
|
||||
rofimoji
|
||||
rofi-bluetooth
|
||||
rofi-power-menu
|
||||
rofi-vpn
|
||||
xdotool
|
||||
;
|
||||
};
|
||||
|
||||
programs.rofi = {
|
||||
enable = true;
|
||||
location = "center";
|
||||
font = "${pkgs.rice.font.monospace.name} ${toString pkgs.rice.font.monospace.size}";
|
||||
plugins = [ pkgs.rofi-calc ];
|
||||
extraConfig = { modi = "drun,run,ssh,window,calc"; };
|
||||
terminal = "alacritty";
|
||||
theme = "onedark";
|
||||
};
|
||||
|
||||
xdg.configFile."rofi/nord.rasi".source = ../configs/rofi/nord.rasi;
|
||||
xdg.configFile."rofi/onedark.rasi".source = ../configs/rofi/onedark.rasi;
|
||||
}
|
||||
|
|
@ -1,66 +0,0 @@
|
|||
<<<<<<< HEAD
|
||||
{ pkgs, ... }:
|
||||
let
|
||||
strPalette = pkgs.lib.nix-rice.palette.toRgbHex pkgs.rice.colorPalette;
|
||||
in
|
||||
{
|
||||
programs.zellij.enable = true;
|
||||
|
||||
home.shellAliases."ze" = "zellij";
|
||||
|
||||
xdg.configFile."zellij/config.kdl".text = ''
|
||||
theme "nix-rice"
|
||||
pane_frames false
|
||||
'';
|
||||
|
||||
xdg.configFile."zellij/themes/nix-rice.kdl".text = ''
|
||||
themes {
|
||||
nix-rice {
|
||||
bg "${strPalette.primary.foreground}"
|
||||
fg "${strPalette.primary.background}"
|
||||
red "${strPalette.normal.red}"
|
||||
black "${strPalette.normal.black}"
|
||||
green "${strPalette.normal.green}"
|
||||
yellow "${strPalette.normal.yellow}"
|
||||
blue "${strPalette.normal.blue}"
|
||||
magenta "${strPalette.normal.magenta}"
|
||||
cyan "${strPalette.normal.cyan}"
|
||||
white "${strPalette.normal.white}"
|
||||
orange "${strPalette.bright.red}"
|
||||
}
|
||||
}
|
||||
'';
|
||||
}
|
||||
||||||| parent of 6c85a84 (Zellij)
|
||||
=======
|
||||
{ pkgs, ... }:
|
||||
let
|
||||
strPalette = pkgs.lib.nix-rice.palette.toRgbHex pkgs.rice.colorPalette;
|
||||
in
|
||||
{
|
||||
programs.zellij.enable = true;
|
||||
|
||||
xdg.configFile."zellij/config.kdl".text = ''
|
||||
theme "nix-rice"
|
||||
pane_frames false
|
||||
'';
|
||||
|
||||
xdg.configFile."zellij/themes/nix-rice.kdl".text = ''
|
||||
themes {
|
||||
nix-rice {
|
||||
bg "${strPalette.primary.foreground}"
|
||||
fg "${strPalette.primary.background}"
|
||||
red "${strPalette.normal.red}"
|
||||
black "${strPalette.normal.black}"
|
||||
green "${strPalette.normal.green}"
|
||||
yellow "${strPalette.normal.yellow}"
|
||||
blue "${strPalette.normal.blue}"
|
||||
magenta "${strPalette.normal.magenta}"
|
||||
cyan "${strPalette.normal.cyan}"
|
||||
white "${strPalette.normal.white}"
|
||||
orange "${strPalette.bright.red}"
|
||||
}
|
||||
}
|
||||
'';
|
||||
}
|
||||
>>>>>>> 6c85a84 (Zellij)
|
||||
30
instances/baldur/hm.nix
Normal file
30
instances/baldur/hm.nix
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
{ pkgs, ... }: {
|
||||
home = {
|
||||
language.base = "it_IT.UTF-8";
|
||||
keyboard = {
|
||||
layout = "it";
|
||||
options = [ "terminate:ctrl_alt_bksp" "compose:rctrl" "grp:menu_toggle" ];
|
||||
};
|
||||
packages = builtins.attrValues { inherit (pkgs) nix-prefetch-scripts; };
|
||||
};
|
||||
imports = [
|
||||
../../modules/hm/__basic.nix
|
||||
|
||||
# ../../modules/hm/development/cpp.nix
|
||||
# ../../modules/hm/development/data.nix
|
||||
# ../../modules/hm/development/go.nix
|
||||
# ../../modules/hm/development/javascript.nix
|
||||
# ../../modules/hm/development/latex.nix
|
||||
# ../../modules/hm/development/python.nix
|
||||
# ../../modules/hm/development/rust.nix
|
||||
|
||||
# ../../modules/hm/fonts.nix
|
||||
../../modules/hm/helix.nix
|
||||
# ../../modules/hm/kitty.nix
|
||||
# ../../modules/hm/lf.nix
|
||||
# ../../modules/hm/megasync.nix
|
||||
# ../../modules/hm/noti.nix
|
||||
];
|
||||
|
||||
home.stateVersion = "22.05";
|
||||
}
|
||||
|
|
@ -11,16 +11,16 @@
|
|||
};
|
||||
};
|
||||
imports = [
|
||||
../hm_modules/__basic.nix
|
||||
../../modules/hm/__basic.nix
|
||||
|
||||
../hm_modules/cava.nix
|
||||
../hm_modules/dunst.nix
|
||||
../hm_modules/helix.nix
|
||||
../hm_modules/kitty.nix
|
||||
../hm_modules/lf.nix
|
||||
../hm_modules/spotifyd.nix
|
||||
../hm_modules/syncthing.nix
|
||||
# ../hm_modules/xidlehook.nix
|
||||
../../modules/hm/cava.nix
|
||||
../../modules/hm/dunst.nix
|
||||
../../modules/hm/helix.nix
|
||||
../../modules/hm/kitty.nix
|
||||
../../modules/hm/lf.nix
|
||||
../../modules/hm/spotifyd.nix
|
||||
../../modules/hm/syncthing.nix
|
||||
# ../../modules/hm/xidlehook.nix
|
||||
];
|
||||
|
||||
home.stateVersion = "22.11";
|
||||
32
instances/loki/hm.nix
Normal file
32
instances/loki/hm.nix
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
{
|
||||
home = {
|
||||
language.base = "it_IT.UTF-8";
|
||||
keyboard = {
|
||||
layout = "it";
|
||||
options = [ "terminate:ctrl_alt_bksp" "compose:rctrl" ];
|
||||
};
|
||||
};
|
||||
imports = [
|
||||
../../modules/hm/__basic.nix
|
||||
|
||||
# ../../modules/hm/development/cpp.nix
|
||||
# ../../modules/hm/development/data.nix
|
||||
# ../../modules/hm/development/go.nix
|
||||
# ../../modules/hm/development/javascript.nix
|
||||
# ../../modules/hm/development/latex.nix
|
||||
# ../../modules/hm/development/nix.nix
|
||||
# ../../modules/hm/development/python.nix
|
||||
# ../../modules/hm/development/rust.nix
|
||||
|
||||
../../modules/hm/helix.nix
|
||||
../../modules/hm/kakoune.nix
|
||||
../../modules/hm/kitty.nix
|
||||
../../modules/hm/lf.nix
|
||||
../../modules/hm/megasync.nix
|
||||
../../modules/hm/syncthing.nix
|
||||
|
||||
../../modules/hm/shell_aliases.nix
|
||||
];
|
||||
|
||||
home.stateVersion = "22.11";
|
||||
}
|
||||
23
instances/loki/hm_tiziano.nix
Normal file
23
instances/loki/hm_tiziano.nix
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
{
|
||||
home = {
|
||||
language.base = "it_IT.UTF-8";
|
||||
keyboard = {
|
||||
layout = "it";
|
||||
options = [ "terminate:ctrl_alt_bksp" "compose:rctrl" ];
|
||||
};
|
||||
};
|
||||
imports = [
|
||||
../../modules/hm/__basic.nix
|
||||
|
||||
../../modules/hm/helix.nix
|
||||
../../modules/hm/kakoune.nix
|
||||
../../modules/hm/kitty.nix
|
||||
../../modules/hm/lf.nix
|
||||
../../modules/hm/megasync.nix
|
||||
../../modules/hm/syncthing_tiziano.nix
|
||||
|
||||
../../modules/hm/shell_aliases.nix
|
||||
];
|
||||
|
||||
home.stateVersion = "21.11";
|
||||
}
|
||||
122
instances/odin/hm.nix
Normal file
122
instances/odin/hm.nix
Normal file
|
|
@ -0,0 +1,122 @@
|
|||
{ pkgs, ... }: {
|
||||
home = {
|
||||
language.base = "it_IT.UTF-8";
|
||||
keyboard = {
|
||||
layout = "it,us,us";
|
||||
variant = ",,colemak";
|
||||
options = [ "terminate:ctrl_alt_bksp" "compose:rctrl" "grp:menu_toggle" ];
|
||||
};
|
||||
packages = builtins.attrValues {
|
||||
inherit (pkgs)
|
||||
# element-desktop # matrix client
|
||||
# freecad
|
||||
# lutris
|
||||
# minecraft
|
||||
# mycrypto
|
||||
# pcmanfm
|
||||
# pulseaudio
|
||||
# signal-desktop
|
||||
# slack
|
||||
# wineFull
|
||||
arandr authenticator authy cava discord dmenu droidcam easyeffects evince evolution gallery-dl google-chrome gucharmap handbrake httpie inkscape keyboard-switch krita openvpn p7zip pavucontrol pentablet-driver procps pulseaudio retroarchFull shotwell spotify tdesktop 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.unstable_pkgs) postman skypeforlinux;
|
||||
};
|
||||
};
|
||||
|
||||
services = { gnome-keyring.enable = true; };
|
||||
|
||||
xsession = {
|
||||
enable = true;
|
||||
numlock.enable = true;
|
||||
initExtra = ''
|
||||
## Touchpad
|
||||
${pkgs.xorg.xinput}/bin/xinput set-prop 'DELL0824:00 06CB:7E92 Touchpad' 'libinput Natural Scrolling Enabled' 1
|
||||
${pkgs.xorg.xinput}/bin/xinput set-prop 'DELL0824:00 06CB:7E92 Touchpad' 'libinput Tapping Enabled' 1
|
||||
${pkgs.xorg.xinput}/bin/xinput set-prop 'DELL0824:00 06CB:7E92 Touchpad' 'libinput Disable While Typing Enabled' 1
|
||||
'';
|
||||
};
|
||||
|
||||
imports = [
|
||||
../../modules/hm/__basic.nix
|
||||
|
||||
../../modules/hm/development/cpp.nix
|
||||
../../modules/hm/development/data.nix
|
||||
../../modules/hm/development/database.nix
|
||||
../../modules/hm/development/docker.nix
|
||||
# ../../modules/hm/development/go.nix
|
||||
../../modules/hm/development/javascript.nix
|
||||
../../modules/hm/development/kubernetes.nix
|
||||
../../modules/hm/development/latex.nix
|
||||
../../modules/hm/development/markdown.nix
|
||||
../../modules/hm/development/nix.nix
|
||||
../../modules/hm/development/python.nix
|
||||
../../modules/hm/development/rust.nix
|
||||
|
||||
../../modules/hm/alacritty.nix
|
||||
../../modules/hm/autorandr.nix
|
||||
../../modules/hm/biblio.nix
|
||||
../../modules/hm/bitwarden.nix
|
||||
../../modules/hm/blender.nix
|
||||
../../modules/hm/bspwm.nix
|
||||
../../modules/hm/cava.nix
|
||||
../../modules/hm/dunst.nix
|
||||
# ../../modules/hm/dwarf-fortress.nix
|
||||
../../modules/hm/easyeffects.nix
|
||||
../../modules/hm/firefox.nix
|
||||
# ../../modules/hm/fonts.nix
|
||||
# ../../modules/hm/gnome_shell.nix
|
||||
# ../../modules/hm/grobi.nix
|
||||
../../modules/hm/gtk_theme.nix
|
||||
../../modules/hm/heif.nix
|
||||
../../modules/hm/helix.nix
|
||||
# ../../modules/hm/joystickwake.nix
|
||||
../../modules/hm/kakoune.nix
|
||||
../../modules/hm/kdeconnect.nix
|
||||
# ../../modules/hm/keepassxc.nix
|
||||
../../modules/hm/kicad.nix
|
||||
# ../../modules/hm/kitty.nix
|
||||
../../modules/hm/lf.nix
|
||||
../../modules/hm/libinput-gestures.nix
|
||||
../../modules/hm/mangohud.nix
|
||||
../../modules/hm/megasync.nix
|
||||
../../modules/hm/mpv.nix
|
||||
# ../../modules/hm/nautilus.nix
|
||||
../../modules/hm/ncspot.nix
|
||||
../../modules/hm/nix-index.nix
|
||||
../../modules/hm/noti.nix
|
||||
../../modules/hm/nushell.nix
|
||||
../../modules/hm/obs-studio.nix
|
||||
../../modules/hm/office.nix
|
||||
../../modules/hm/pass.nix
|
||||
../../modules/hm/picom.nix
|
||||
../../modules/hm/polybar.nix
|
||||
../../modules/hm/pro_audio.nix
|
||||
../../modules/hm/pycharm.nix
|
||||
../../modules/hm/research.nix
|
||||
../../modules/hm/rofi.nix
|
||||
# ../../modules/hm/screen_locker.nix
|
||||
# ../../modules/hm/security.nix
|
||||
../../modules/hm/spotifyd.nix
|
||||
../../modules/hm/sxhkd.nix
|
||||
../../modules/hm/syncthing.nix
|
||||
../../modules/hm/terminator.nix
|
||||
# ../../modules/hm/thunar.nix
|
||||
# ../../modules/hm/twmn.nix
|
||||
../../modules/hm/update_background.nix
|
||||
../../modules/hm/vim.nix
|
||||
../../modules/hm/webapp.nix
|
||||
../../modules/hm/xidlehook.nix
|
||||
../../modules/hm/xresources.nix
|
||||
../../modules/hm/zathura.nix
|
||||
../../modules/hm/zellij.nix
|
||||
];
|
||||
|
||||
home.stateVersion = "22.05";
|
||||
}
|
||||
111
instances/thor/hm.nix
Normal file
111
instances/thor/hm.nix
Normal file
|
|
@ -0,0 +1,111 @@
|
|||
{ pkgs, ... }: {
|
||||
home = {
|
||||
language.base = "it_IT.UTF-8";
|
||||
keyboard = {
|
||||
layout = "us,it";
|
||||
variant = ",colemak,";
|
||||
options = [ "terminate:ctrl_alt_bksp" "compose:rctrl" "grp:menu_toggle" ];
|
||||
};
|
||||
packages = builtins.attrValues {
|
||||
inherit (pkgs)
|
||||
# electrum
|
||||
# element-desktop # matrix client
|
||||
evolution
|
||||
# freecad
|
||||
# minecraft
|
||||
# mycrypto
|
||||
# pcmanfm
|
||||
# pulseaudio
|
||||
# signal-desktop
|
||||
# slack
|
||||
# wineFull
|
||||
arandr authenticator authy discord dmenu docker-compose docker-machine droidcam easyeffects evince filelight gallery-dl google-chrome gucharmap handbrake httpie inkscape krita openvpn p7zip pavucontrol pcsx2 pentablet-driver procps pulseaudio retroarchFull shotwell spotify tdesktop 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.unstable_pkgs) postman skypeforlinux;
|
||||
};
|
||||
};
|
||||
|
||||
services = { gnome-keyring.enable = true; };
|
||||
|
||||
imports = [
|
||||
../../modules/hm/__basic.nix
|
||||
|
||||
../../modules/hm/development/cpp.nix
|
||||
../../modules/hm/development/data.nix
|
||||
../../modules/hm/development/database.nix
|
||||
../../modules/hm/development/docker.nix
|
||||
# ../../modules/hm/development/go.nix
|
||||
../../modules/hm/development/javascript.nix
|
||||
../../modules/hm/development/kubernetes.nix
|
||||
../../modules/hm/development/latex.nix
|
||||
../../modules/hm/development/markdown.nix
|
||||
../../modules/hm/development/nix.nix
|
||||
../../modules/hm/development/python.nix
|
||||
../../modules/hm/development/rust.nix
|
||||
|
||||
../../modules/hm/alacritty.nix
|
||||
../../modules/hm/autorandr.nix
|
||||
../../modules/hm/biblio.nix
|
||||
../../modules/hm/bitwarden.nix
|
||||
../../modules/hm/blender_nvidia.nix
|
||||
../../modules/hm/bspwm.nix
|
||||
../../modules/hm/cava.nix
|
||||
../../modules/hm/dunst.nix
|
||||
# ../../modules/hm/dwarf-fortress.nix
|
||||
../../modules/hm/easyeffects.nix
|
||||
../../modules/hm/firefox.nix
|
||||
../../modules/hm/fonts.nix
|
||||
# ../../modules/hm/gnome_shell.nix
|
||||
# ../../modules/hm/grobi.nix
|
||||
../../modules/hm/gtk_theme.nix
|
||||
../../modules/hm/heif.nix
|
||||
../../modules/hm/helix.nix
|
||||
../../modules/hm/joystickwake.nix
|
||||
../../modules/hm/kakoune.nix
|
||||
../../modules/hm/kdeconnect.nix
|
||||
# ../../modules/hm/keepassxc.nix
|
||||
# ../../modules/hm/kitty.nix
|
||||
../../modules/hm/lf.nix
|
||||
../../modules/hm/lutris.nix
|
||||
../../modules/hm/mangohud.nix
|
||||
../../modules/hm/megasync.nix
|
||||
../../modules/hm/mpv.nix
|
||||
# ../../modules/hm/nautilus.nix
|
||||
../../modules/hm/ncspot.nix
|
||||
../../modules/hm/nix-index.nix
|
||||
../../modules/hm/noti.nix
|
||||
../../modules/hm/nushell.nix
|
||||
../../modules/hm/obs-studio.nix
|
||||
../../modules/hm/office.nix
|
||||
../../modules/hm/pass.nix
|
||||
../../modules/hm/picom.nix
|
||||
../../modules/hm/polybar.nix
|
||||
../../modules/hm/pro_audio.nix
|
||||
../../modules/hm/pycharm.nix
|
||||
../../modules/hm/spotifyd.nix
|
||||
../../modules/hm/research.nix
|
||||
../../modules/hm/rofi.nix
|
||||
# ../../modules/hm/screen_locker.nix
|
||||
# ../../modules/hm/security.nix
|
||||
../../modules/hm/sxhkd.nix
|
||||
../../modules/hm/syncthing.nix
|
||||
../../modules/hm/terminator.nix
|
||||
# ../../modules/hm/thunar.nix
|
||||
# ../../modules/hm/twmn.nix
|
||||
../../modules/hm/update_background.nix
|
||||
../../modules/hm/vim.nix
|
||||
../../modules/hm/webapp.nix
|
||||
../../modules/hm/xidlehook.nix
|
||||
../../modules/hm/xresources.nix
|
||||
../../modules/hm/zathura.nix
|
||||
../../modules/hm/zellij.nix
|
||||
];
|
||||
|
||||
home.stateVersion = "22.11";
|
||||
}
|
||||
32
loki/hm.nix
32
loki/hm.nix
|
|
@ -1,32 +0,0 @@
|
|||
{
|
||||
home = {
|
||||
language.base = "it_IT.UTF-8";
|
||||
keyboard = {
|
||||
layout = "it";
|
||||
options = [ "terminate:ctrl_alt_bksp" "compose:rctrl" ];
|
||||
};
|
||||
};
|
||||
imports = [
|
||||
../hm_modules/__basic.nix
|
||||
|
||||
# ../hm_modules/development/cpp.nix
|
||||
# ../hm_modules/development/data.nix
|
||||
# ../hm_modules/development/go.nix
|
||||
# ../hm_modules/development/javascript.nix
|
||||
# ../hm_modules/development/latex.nix
|
||||
# ../hm_modules/development/nix.nix
|
||||
# ../hm_modules/development/python.nix
|
||||
# ../hm_modules/development/rust.nix
|
||||
|
||||
../hm_modules/helix.nix
|
||||
../hm_modules/kakoune.nix
|
||||
../hm_modules/kitty.nix
|
||||
../hm_modules/lf.nix
|
||||
../hm_modules/megasync.nix
|
||||
../hm_modules/syncthing.nix
|
||||
|
||||
../hm_modules/shell_aliases.nix
|
||||
];
|
||||
|
||||
home.stateVersion = "22.11";
|
||||
}
|
||||
|
|
@ -1,23 +0,0 @@
|
|||
{
|
||||
home = {
|
||||
language.base = "it_IT.UTF-8";
|
||||
keyboard = {
|
||||
layout = "it";
|
||||
options = [ "terminate:ctrl_alt_bksp" "compose:rctrl" ];
|
||||
};
|
||||
};
|
||||
imports = [
|
||||
../hm_modules/__basic.nix
|
||||
|
||||
../hm_modules/helix.nix
|
||||
../hm_modules/kakoune.nix
|
||||
../hm_modules/kitty.nix
|
||||
../hm_modules/lf.nix
|
||||
../hm_modules/megasync.nix
|
||||
../hm_modules/syncthing_tiziano.nix
|
||||
|
||||
../hm_modules/shell_aliases.nix
|
||||
];
|
||||
|
||||
home.stateVersion = "21.11";
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue