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

Merge branch 'upgrade-to-23-05'

Browse source
This commit is contained in:
Filippo Berto 2023-06-06 00:28:44 +02:00
commit ccaaed552b
Signed by: bertof
GPG key ID: 9DBF7E6A1D2CE9ED
11 changed files with 135 additions and 173 deletions
Download patch file Download diff file Expand all files Collapse all files

2
baldur/configuration.nix
View file

@ -40,7 +40,7 @@
avahi = { avahi = {
enable = true; enable = true;
openFirewall = true; openFirewall = true;
interfaces = [ "ztmjfdwjkp" ]; allowInterfaces = [ "ztmjfdwjkp" ];
nssmdns = true; nssmdns = true;
publish = { publish = {
enable = true; enable = true;

91
flake.lock generated
View file

@ -3,16 +3,17 @@
"agenix": { "agenix": {
"inputs": { "inputs": {
"darwin": "darwin", "darwin": "darwin",
"home-manager": "home-manager",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1682101079, "lastModified": 1684153753,
"narHash": "sha256-MdAhtjrLKnk2uiqun1FWABbKpLH090oeqCSiWemtuck=", "narHash": "sha256-PVbWt3qrjYAK+T5KplFcO+h7aZWfEj1UtyoKlvcDxh0=",
"owner": "ryantm", "owner": "ryantm",
"repo": "agenix", "repo": "agenix",
"rev": "2994d002dcff5353ca1ac48ec584c7f6589fe447", "rev": "db5637d10f797bb251b94ef9040b237f4702cde3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -52,11 +53,11 @@
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1682063650, "lastModified": 1685948350,
"narHash": "sha256-VaDHh2z6xlnTHaONlNVHP7qEMcK5rZ8Js3sT6mKb2XY=", "narHash": "sha256-1FldJ059so0X/rScdbIiOlQbjjSNCCTdj2cUr5pHU4A=",
"owner": "serokell", "owner": "serokell",
"repo": "deploy-rs", "repo": "deploy-rs",
"rev": "c2ea4e642dc50fd44b537e9860ec95867af30d39", "rev": "65211db63ba1199f09b4c9f27e5eba5ec50d76ac",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -134,11 +135,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1681202837, "lastModified": 1685518550,
"narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "cfacdce06f30d2b68473a46042957675eebb3401", "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -211,23 +212,41 @@
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"agenix",
"nixpkgs" "nixpkgs"
],
"utils": [
"flake-utils"
] ]
}, },
"locked": { "locked": {
"lastModified": 1681092193, "lastModified": 1682203081,
"narHash": "sha256-JerCqqOqbT2tBnXQW4EqwFl0hHnuZp21rIQ6lu/N4rI=", "narHash": "sha256-kRL4ejWDhi0zph/FpebFYhzqlOBrk0Pl3dzGEKSAlEw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "f9edbedaf015013eb35f8caacbe0c9666bbc16af", "rev": "32d3e39c491e2f91152c84f8ad8b003420eab0a1",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-22.11", "repo": "home-manager",
"type": "github"
}
},
"home-manager_2": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1685599623,
"narHash": "sha256-Tob4CMOVHue0D3RzguDBCtUmX5ji2PsdbQDbIOIKvsc=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "93db05480c0c0f30382d3e80779e8386dcb4f9dd",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "release-23.05",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -272,11 +291,11 @@
}, },
"nixlib": { "nixlib": {
"locked": { "locked": {
"lastModified": 1681001314, "lastModified": 1685840432,
"narHash": "sha256-5sDnCLdrKZqxLPK4KA8+f4A3YKO/u6ElpMILvX0g72c=", "narHash": "sha256-VJIbiKsY7Xy4E4WcgwUt/UiwYDmN5BAk8tngAjcWsqY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs.lib", "repo": "nixpkgs.lib",
"rev": "367c0e1086a4eb4502b24d872cea2c7acdd557f4", "rev": "961e99baaaa57f5f7042fe7ce089a88786c839f4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -293,11 +312,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1682332772, "lastModified": 1685943944,
"narHash": "sha256-GMoWhChQdeNM2FFqVbEZgBABSdi/+JgSP6v+jUz5b24=", "narHash": "sha256-GpaQwOkvwkmSWxvWaZqbMKyyOSaBAwgdEcHCqLW/240=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixos-generators", "repo": "nixos-generators",
"rev": "d774aeedc0685e5871be1e1ee0511900deeb21c2", "rev": "122dcc32cadf14c5015aa021fae8882c5058263a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -308,11 +327,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1682836095, "lastModified": 1684899633,
"narHash": "sha256-PdzpJhuXBz71AgWNWMMYLbB8GMMce6QguhQY/6HOOcc=", "narHash": "sha256-NtwerXX8UFsoNy6k+DukJMriWtEjQtMU/Urbff2O2Dg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "e4a21ddcb45ee5f5c85a5d9e9698debf77fb98c3", "rev": "4cc688ee711159b9bcb5a367be44007934e1a49d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -386,11 +405,11 @@
}, },
"nixpkgs-u": { "nixpkgs-u": {
"locked": { "locked": {
"lastModified": 1682786779, "lastModified": 1685836261,
"narHash": "sha256-m7QFzPS/CE8hbkbIVK4UStihAQMtczr0vSpOgETOM1g=", "narHash": "sha256-rpxEPGeW4JZJcH58SQApJUtJ7w78VPtkF6Cut/Pq6Kg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "08e4dc3a907a6dfec8bb3bbf1540d8abbffea22b", "rev": "dd4982554e18b936790da07c4ea2db7c7600f283",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -402,16 +421,16 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1682912022, "lastModified": 1685952468,
"narHash": "sha256-9a1juOuPBj9U61jcG630rd3Sqfx7RxyJDzmlbQA5qE0=", "narHash": "sha256-YCOr9kttCqoa9IZMjHxX6SlwenTg7FsSmG9TaT76mSE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7a8d9a8e84ea09987a6d68f5cd26e2fb1aa20fd3", "rev": "70f7275b32f49bc67ae3532b758b80cb6c27f98a",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "release-22.11", "ref": "release-23.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -454,11 +473,11 @@
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1682596858, "lastModified": 1685957890,
"narHash": "sha256-Hf9XVpqaGqe/4oDGr30W8HlsWvJXtMsEPHDqHZA6dDg=", "narHash": "sha256-oat5CkVZnfZlMNO7mRz5hbgaC88SViwZZR11Fl0rii4=",
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "pre-commit-hooks.nix",
"rev": "fb58866e20af98779017134319b5663b8215d912", "rev": "238a10d458d46d4af3e89ccd6b83b1e8e9807b23",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -472,7 +491,7 @@
"agenix": "agenix", "agenix": "agenix",
"deploy-rs": "deploy-rs", "deploy-rs": "deploy-rs",
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"home-manager": "home-manager", "home-manager": "home-manager_2",
"nix-rice": "nix-rice", "nix-rice": "nix-rice",
"nixos-generators": "nixos-generators", "nixos-generators": "nixos-generators",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",

11
flake.nix
View file

@ -2,9 +2,9 @@
description = "Thor system configuration"; description = "Thor system configuration";
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/release-22.11"; nixpkgs.url = "github:NixOS/nixpkgs/release-23.05";
nixpkgs-u.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs-u.url = "github:NixOS/nixpkgs/nixos-unstable";
home-manager = { url = "github:nix-community/home-manager/release-22.11"; inputs = { nixpkgs.follows = "nixpkgs"; utils.follows = "flake-utils"; }; }; home-manager = { url = "github:nix-community/home-manager/release-23.05"; inputs.nixpkgs.follows = "nixpkgs"; };
# home-manager-u = { url = "github:nix-community/home-manager"; inputs = { nixpkgs.follows = "nixpkgs-u"; }; }; # home-manager-u = { url = "github:nix-community/home-manager"; inputs = { nixpkgs.follows = "nixpkgs-u"; }; };
agenix = { url = "github:ryantm/agenix"; inputs.nixpkgs.follows = "nixpkgs"; }; agenix = { url = "github:ryantm/agenix"; inputs.nixpkgs.follows = "nixpkgs"; };
@ -196,13 +196,13 @@
system = "aarch64-linux"; system = "aarch64-linux";
modules = commonModules ++ [ modules = commonModules ++ [
nixos-hardware.nixosModules.raspberry-pi-4 nixos-hardware.nixosModules.raspberry-pi-4
./freya/hardware-configuration.nix
./freya/configuration.nix
({ lib, ... }: { ({ lib, ... }: {
boot.supportedFilesystems = lib.mkForce [ "btrfs" "reiserfs" "vfat" "f2fs" "xfs" "ntfs" "cifs" ]; boot.supportedFilesystems = lib.mkForce [ "btrfs" "reiserfs" "vfat" "f2fs" "xfs" "ntfs" "cifs" ];
}) })
./freya/hardware-configuration.nix
./freya/configuration.nix
./nixos_modules/garage.nix ./nixos_modules/garage.nix
# ./nixos_modules/nextcloud.nix # ./nixos_modules/nextcloud.nix
] ++ homeManagerModules ++ [ ] ++ homeManagerModules ++ [
@ -240,7 +240,6 @@
./loki/configuration.nix ./loki/configuration.nix
./nixos_modules/garage.nix ./nixos_modules/garage.nix
(nixpkgs-u + "/nixos/modules/services/misc/readarr.nix")
./nixos_modules/readarr.nix ./nixos_modules/readarr.nix
] ++ homeManagerModules ++ [ ] ++ homeManagerModules ++ [
{ {

5
freya/configuration.nix
View file

@ -11,15 +11,14 @@
bluetooth = { enable = true; package = pkgs.bluezFull; }; bluetooth = { enable = true; package = pkgs.bluezFull; };
opengl = { enable = true; driSupport = true; }; opengl = { enable = true; driSupport = true; };
raspberry-pi."4" = { raspberry-pi."4" = {
audio.enable = true; # audio.enable = true; # AUDIO
fkms-3d.enable = true; # GPU # fkms-3d.enable = true; # GPU
}; };
}; };
i18n.defaultLocale = "it_IT.UTF-8"; i18n.defaultLocale = "it_IT.UTF-8";
networking.hostName = "freya"; networking.hostName = "freya";
# networking.firewall.allowedTCPPorts = [ 80 ];
networking.firewall = { networking.firewall = {
enable = true; enable = true;
allowPing = true; allowPing = true;

2
hm_modules/helix.nix
View file

@ -12,7 +12,7 @@
programs.helix = { programs.helix = {
enable = true; enable = true;
package = pkgs.unstable_pkgs.helix; package = pkgs.unstable_pkgs.helix;
languages = [{ languages.language = [{
name = "nix"; name = "nix";
formatter = { command = "nixpkgs-fmt"; }; formatter = { command = "nixpkgs-fmt"; };
# config = { nil = { formatting = { command = "nixpkgs-fmt"; }; }; }; # config = { nil = { formatting = { command = "nixpkgs-fmt"; }; }; };

74
hm_modules/polybar.nix
View file

@ -12,7 +12,7 @@ let
zscroll = "${pkgs.zscroll}/bin/zscroll"; zscroll = "${pkgs.zscroll}/bin/zscroll";
notificationStatus = pkgs.writeShellScript "notificationStatus" '' notificationStatus = pkgs.writeShellScript "notificationStatus" ''
PATH=$PATH:"${lib.makeBinPath [ pkgs.dbus ]}" PATH=$PATH:"${lib.makeBinPath [ pkgs.dbus ]}"
if [[ `${dunstctl} is-paused` == "true" ]]; then echo ; else echo ; fi if [[ `${dunstctl} is-paused` == "true" ]]; then echo 󰂚; else echo 󰂛; fi
''; '';
notificationToggle = pkgs.writeShellScript "notificationToggle" '' notificationToggle = pkgs.writeShellScript "notificationToggle" ''
PATH=$PATH:"${lib.makeBinPath [ pkgs.dbus ]}" PATH=$PATH:"${lib.makeBinPath [ pkgs.dbus ]}"
@ -38,10 +38,10 @@ let
${playerCtl} -f '{{title}} - {{artist}}' metadata || true ${playerCtl} -f '{{title}} - {{artist}}' metadata || true
''; '';
playerStatus = pkgs.writeShellScript "playerStatus" '' playerStatus = pkgs.writeShellScript "playerStatus" ''
${zscroll} -l 20 -M ${playerStatusBasic} -n -s 1 \ ${zscroll} -l 25 -M ${playerStatusBasic} \
-m "Playing" -b '▶ ' \ -m "Playing" "-b '▶ ' -s 1" \
-m "Paused" -b '⏸ ' \ -m "Paused" "-b '⏸ ' -s 0" \
-u ${playerStatusSrc} & -u true ${playerStatusSrc} &
wait wait
''; '';
confirm_command = { cmd, title ? null, text ? null, image ? null }: confirm_command = { cmd, title ? null, text ? null, image ? null }:
@ -178,14 +178,8 @@ in
full.at = 98; full.at = 98;
animation = { animation = {
charging = { charging = { text = [ "" "" "" "" "" ]; framerate = "750"; };
text = [ "" "" "" "" "" "" "" "" "" "" ]; discharging = { text = [ "" "" "" "" "" ]; framerate = "750"; };
framerate = "750";
};
discharging = {
text = [ "" "" "" "" "" "" "" "" "" "" ];
framerate = "750";
};
}; };
format = { format = {
@ -195,7 +189,7 @@ in
discharging = recursiveUpdate colors.active { discharging = recursiveUpdate colors.active {
text = "<animation-discharging> <label-discharging>"; text = "<animation-discharging> <label-discharging>";
}; };
full = recursiveUpdate colors.normal { text = " <label-full>"; }; full = recursiveUpdate colors.normal { text = " <label-full>"; };
}; };
label.text = "%percentage%%"; label.text = "%percentage%%";
@ -221,16 +215,14 @@ in
{ {
focused = recursiveUpdate common colors.selected; focused = recursiveUpdate common colors.selected;
occupied = recursiveUpdate common colors.active; occupied = recursiveUpdate common colors.active;
urgent = recursiveUpdate (recursiveUpdate common colors.active) { urgent = recursiveUpdate (recursiveUpdate common colors.active) { background = colors.alert; };
background = colors.alert;
};
empty = recursiveUpdate common colors.normal; empty = recursiveUpdate common colors.normal;
}; };
}; };
"module/cpu" = { "module/cpu" = {
type = "internal/cpu"; type = "internal/cpu";
format = recursiveUpdate colors.normal { text = " <label>"; }; format = recursiveUpdate colors.normal { text = " <label>"; };
interval = 2; interval = 2;
label = "%percentage-sum%%"; label = "%percentage-sum%%";
ramp-load = ramp; ramp-load = ramp;
@ -238,22 +230,16 @@ in
"module/date" = { "module/date" = {
type = "internal/date"; type = "internal/date";
date = { format = colors.normal;
alt = "%Y-%m-%d"; date = { alt = "%Y-%m-%d"; text = "%a %d/%m/%y"; };
text = "%a %d/%m/%y";
};
interval = "1"; interval = "1";
label = "%date% %time%"; label = "%date% %time%";
time = { time = { alt = "%H:%M:%S"; text = "%H:%M"; };
alt = "%H:%M:%S";
text = "%H:%M";
};
format = colors.normal;
}; };
"module/memory" = { "module/memory" = {
type = "internal/memory"; type = "internal/memory";
format = recursiveUpdate colors.normal { text = " <label>"; }; format = recursiveUpdate colors.normal { text = " <label>"; };
interval = 2; interval = 2;
label = "%percentage_used%%"; label = "%percentage_used%%";
ramp-used = ramp; ramp-used = ramp;
@ -286,9 +272,9 @@ in
text = "<ramp-volume> <label-volume>"; text = "<ramp-volume> <label-volume>";
}; };
}; };
label.muted.text = "婢 muted"; label.muted.text = "󰝟 muted";
label.volume.text = "%percentage%%"; label.volume.text = "%percentage%%";
ramp.volume = [ "奄" "奔" "墳" ]; ramp.volume = [ "󰕿" "󰖀" "󰕾" ];
type = "internal/pulseaudio"; type = "internal/pulseaudio";
}; };
@ -323,36 +309,20 @@ in
menu = [ menu = [
[ [
{ {
text = ""; text = "󰍃";
exec = confirm_command { exec = confirm_command { cmd = logout; title = "Logout"; text = "Do you want to logout?"; };
cmd = logout;
title = "Logout";
text = "Do you want to logout?";
};
} }
{ {
text = ""; text = "󰜉";
exec = confirm_command { exec = confirm_command { cmd = "${systemctl} reboot"; title = "Reboot"; text = "Do you want to reboot?"; };
cmd = "${systemctl} reboot";
title = "Reboot";
text = "Do you want to reboot?";
};
} }
{ {
text = ""; text = "";
exec = confirm_command { exec = confirm_command { cmd = "${systemctl} hibernate"; title = "Hibernate"; text = "Do you want to hibernate?"; };
cmd = "${systemctl} hibernate";
title = "Hibernate";
text = "Do you want to hibernate?";
};
} }
{ {
text = ""; text = "";
exec = confirm_command { exec = confirm_command { cmd = "${shutdown} now"; title = "Shutdown"; text = "Do you want to shutdown?"; };
cmd = "${shutdown} now";
title = "Shutdown";
text = "Do you want to shutdown?";
};
} }
] ]
]; ];

39
loki/configuration.nix
View file

@ -2,7 +2,7 @@
with lib; { with lib; {
boot = { boot = {
binfmt.emulatedSystems = [ "armv7l-linux" "aarch64-linux" ]; binfmt.emulatedSystems = [ "armv7l-linux" "aarch64-linux" ];
kernelPackages = pkgs.linuxPackages_latest; # kernelPackages = pkgs.linuxPackages_latest;
loader = { loader = {
systemd-boot.enable = true; systemd-boot.enable = true;
efi.canTouchEfiVariables = true; efi.canTouchEfiVariables = true;
@ -240,32 +240,23 @@ with lib; {
services.snapper = { services.snapper = {
configs = configs =
let let
commonExtraConfig = '' common = {
TIMELINE_CREATE=yes TIMELINE_CREATE = true;
TIMELINE_CLEANUP=yes TIMELINE_CLEANUP = true;
''; };
in in
{ {
bertof = { bertof = recursiveUpdate common {
subvolume = "/home/bertof/"; SUBVOLUME = "/home/bertof/";
extraConfig = '' ALLOW_USERS = [ "bertof" ];
ALLOW_USERS="bertof"
${commonExtraConfig}
'';
}; };
tiziano = { tiziano = recursiveUpdate common {
subvolume = "/home/tiziano/"; SUBVOLUME = "/home/tiziano/";
extraConfig = '' ALLOW_USERS = [ "tiziano" ];
ALLOW_USERS="tiziano"
${commonExtraConfig}
'';
}; };
condiviso = { condiviso = recursiveUpdate common {
subvolume = "/mnt/condiviso"; SUBVOLUME = "/mnt/condiviso";
extraConfig = '' ALLOW_USERS = [ "bertof" "tiziano" ];
ALLOW_USERS="bertof tiziano"
${commonExtraConfig}
'';
}; };
}; };
}; };
@ -378,7 +369,7 @@ with lib; {
"calendar" "calendar"
"citybikes" "citybikes"
"configurator" "configurator"
"coronavirus" # "coronavirus"
"cover" "cover"
"default_config" "default_config"
"derivative" "derivative"

6
nixos_modules/installer.nix
View file

@ -2,8 +2,10 @@
services.openssh = { services.openssh = {
enable = true; enable = true;
openFirewall = true; openFirewall = true;
# permitRootLogin = "prohibit-password"; settings = {
passwordAuthentication = false; # PermitRootLogin = "prohibit-password";
PasswordAuthentication = false;
};
}; };
users.users.root = { users.users.root = {
openssh.authorizedKeys.keys = [ openssh.authorizedKeys.keys = [

9
nixos_modules/remote-deploy.nix
View file

@ -2,10 +2,11 @@
services.openssh = { services.openssh = {
enable = true; enable = true;
openFirewall = true; openFirewall = true;
settings = {
kbdInteractiveAuthentication = lib.mkDefault false; KbdInteractiveAuthentication = lib.mkDefault false;
permitRootLogin = lib.mkDefault "prohibit-password"; PermitRootLogin = lib.mkDefault "prohibit-password";
passwordAuthentication = lib.mkDefault false; PasswordAuthentication = lib.mkDefault false;
};
}; };
users.users.root.openssh.authorizedKeys.keys = [ users.users.root.openssh.authorizedKeys.keys = [

44
odin/common_configuration.nix
View file

@ -6,7 +6,7 @@ with lib; {
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
boot.initrd.checkJournalingFS = true; boot.initrd.checkJournalingFS = true;
# boot.kernelPackages = pkgs.linuxPackages_latest; # boot.kernelPackages = pkgs.linuxPackages_latest;
boot.kernelPackages = pkgs.linuxPackages_6_1; # boot.kernelPackages = pkgs.linuxPackages_6_1;
boot.extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ]; boot.extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ];
# # Cross-build arm # # Cross-build arm
@ -68,8 +68,7 @@ with lib; {
# Configure keymap in X11 # Configure keymap in X11
layout = "it,us"; layout = "it,us";
xkbOptions = xkbOptions = "eurosign:e,terminate:ctrl_alt_bksp,compose:rctrl,grp:menu_toggle";
"eurosign:e,terminate:ctrl_alt_bksp,compose:rctrl,grp:menu_toggle";
libinput.enable = true; libinput.enable = true;
displayManager.sddm = { displayManager.sddm = {
@ -181,32 +180,23 @@ with lib; {
services.snapper = { services.snapper = {
configs = configs =
let let
bertofExtraConfig = '' common = {
ALLOW_USERS="bertof" ALLOW_USERS = [ "bertof" ];
TIMELINE_CREATE=yes TIMELINE_CREATE = true;
TIMELINE_CLEANUP=yes TIMELINE_CLEANUP = true;
''; };
common = { extraConfig = bertofExtraConfig; };
in in
{ {
bertof_home = recursiveUpdate common { subvolume = "/home/bertof"; }; bertof_home = recursiveUpdate common { SUBVOLUME = "/home/bertof"; };
bertof_music = bertof_music = recursiveUpdate common { SUBVOLUME = "/home/bertof/Musica"; };
recursiveUpdate common { subvolume = "/home/bertof/Musica"; }; bertof_downloads = recursiveUpdate common { SUBVOLUME = "/home/bertof/Scaricati"; };
bertof_downloads = bertof_images = recursiveUpdate common { SUBVOLUME = "/home/bertof/Immagini"; };
recursiveUpdate common { subvolume = "/home/bertof/Scaricati"; }; bertof_videos = recursiveUpdate common { SUBVOLUME = "/home/bertof/Video"; };
bertof_images = bertof_documents = recursiveUpdate common { SUBVOLUME = "/home/bertof/Documenti"; };
recursiveUpdate common { subvolume = "/home/bertof/Immagini"; }; bertof_games_ssd = recursiveUpdate common { SUBVOLUME = "/home/bertof/Giochi/SSD"; };
bertof_videos = bertof_games_sata = recursiveUpdate common { SUBVOLUME = "/home/bertof/Giochi/SATA"; };
recursiveUpdate common { subvolume = "/home/bertof/Video"; }; # bertof_games_hdd = recursiveUpdate common { SUBVOLUME = "/home/bertof/Giochi/HDD"; };
bertof_documents = bertof_git = recursiveUpdate common { SUBVOLUME = "/home/bertof/Documenti/Git"; };
recursiveUpdate common { subvolume = "/home/bertof/Documenti"; };
bertof_games_ssd =
recursiveUpdate common { subvolume = "/home/bertof/Giochi/SSD"; };
bertof_games_sata =
recursiveUpdate common { subvolume = "/home/bertof/Giochi/SATA"; };
# bertof_games_hdd = recursiveUpdate common { subvolume = "/home/bertof/Giochi/HDD"; };
bertof_git =
recursiveUpdate common { subvolume = "/home/bertof/Documenti/Git"; };
}; };
}; };

25
thor/configuration.nix
View file

@ -3,7 +3,7 @@ with lib; {
boot = { boot = {
binfmt.emulatedSystems = [ "armv7l-linux" "aarch64-linux" ]; binfmt.emulatedSystems = [ "armv7l-linux" "aarch64-linux" ];
# kernelPackages = pkgs.linuxPackages_latest; # kernelPackages = pkgs.linuxPackages_latest;
kernelPackages = pkgs.linuxPackages_6_1; # kernelPackages = pkgs.linuxPackages_6_1;
extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ]; extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ];
loader = { loader = {
systemd-boot.enable = true; systemd-boot.enable = true;
@ -110,19 +110,12 @@ with lib; {
# joycond.enable = true; # joycond.enable = true;
keybase.enable = true; keybase.enable = true;
onedrive.enable = true; onedrive.enable = true;
openssh = { openssh = { enable = true; openFirewall = true; };
enable = true;
openFirewall = true;
forwardX11 = true;
};
pipewire = { pipewire = {
enable = true; enable = true;
pulse.enable = true; alsa = { enable = true; support32Bit = true; };
jack.enable = true; jack.enable = true;
alsa = { pulse.enable = true;
enable = true;
support32Bit = true;
};
# media-session.enable = true; # media-session.enable = true;
}; };
power-profiles-daemon.enable = true; power-profiles-daemon.enable = true;
@ -131,15 +124,13 @@ with lib; {
configs = configs =
let let
common = { common = {
extraConfig = '' ALLOW_USERS = [ "bertof" ];
ALLOW_USERS="bertof" TIMELINE_CLEANUP = true;
TIMELINE_CREATE=yes TIMELINE_CREATE = true;
TIMELINE_CLEANUP=yes
'';
}; };
in in
{ {
bertof_home = recursiveUpdate common { subvolume = "/home/bertof"; }; bertof_home = recursiveUpdate common { SUBVOLUME = "/home/bertof"; };
}; };
}; };
thermald.enable = true; thermald.enable = true;