Compare commits
1 commit
12283a81c2
...
fa1a99608f
| Author | SHA1 | Date | |
|---|---|---|---|
| fa1a99608f |
21 changed files with 45 additions and 292 deletions
36
flake.lock
generated
36
flake.lock
generated
|
|
@ -119,11 +119,11 @@
|
||||||
"nixpkgs-stable": "nixpkgs-stable"
|
"nixpkgs-stable": "nixpkgs-stable"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1733473330,
|
"lastModified": 1733361773,
|
||||||
"narHash": "sha256-u+omEO2O4TaUIxOCkCBbgYC9piLN4NEiq/nYwB8hCRY=",
|
"narHash": "sha256-b+cFO1MDGjkR6VnYfTiZTqWQtXbKKFIw0GzvEEzDEOs=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "emacs-overlay",
|
"repo": "emacs-overlay",
|
||||||
"rev": "e3ac055c27f9268a294c911578c7cb04c087c7ab",
|
"rev": "2e6e7801a515f8dbece2d888244a6a2604e36e86",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -485,11 +485,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1733484277,
|
"lastModified": 1733389730,
|
||||||
"narHash": "sha256-i5ay20XsvpW91N4URET/nOc0VQWOAd4c4vbqYtcH8Rc=",
|
"narHash": "sha256-KZMu4ddMll5khS0rYkJsVD0hVqjMNHlhTM3PCQar0Ag=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "d00c6f6d0ad16d598bf7e2956f52c1d9d5de3c3a",
|
"rev": "65912bc6841cf420eb8c0a20e03df7cbbff5963f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -778,11 +778,11 @@
|
||||||
},
|
},
|
||||||
"nixosHardware": {
|
"nixosHardware": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1733481457,
|
"lastModified": 1733217105,
|
||||||
"narHash": "sha256-IS3bxa4N1VMSh3/P6vhEAHQZecQ3oAlKCDvzCQSO5Is=",
|
"narHash": "sha256-fc6jTzIwCIVWTX50FtW6AZpuukuQWSEbPiyg6ZRGWFY=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixos-hardware",
|
"repo": "nixos-hardware",
|
||||||
"rev": "e563803af3526852b6b1d77107a81908c66a9fcf",
|
"rev": "cceee0a31d2f01bcc98b2fbd591327c06a4ea4f9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -935,11 +935,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_3": {
|
"nixpkgs_3": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1733392399,
|
"lastModified": 1733212471,
|
||||||
"narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=",
|
"narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "d0797a04b81caeae77bcff10a9dde78bc17f5661",
|
"rev": "55d15ad12a74eb7d4646254e13638ad0c4128776",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -996,11 +996,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_7": {
|
"nixpkgs_7": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1733392399,
|
"lastModified": 1733212471,
|
||||||
"narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=",
|
"narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "d0797a04b81caeae77bcff10a9dde78bc17f5661",
|
"rev": "55d15ad12a74eb7d4646254e13638ad0c4128776",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1325,11 +1325,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1733440889,
|
"lastModified": 1733222881,
|
||||||
"narHash": "sha256-qKL3vjO+IXFQ0nTinFDqNq/sbbnnS5bMI1y0xX215fU=",
|
"narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "treefmt-nix",
|
"repo": "treefmt-nix",
|
||||||
"rev": "50862ba6a8a0255b87377b9d2d4565e96f29b410",
|
"rev": "49717b5af6f80172275d47a418c9719a31a78b53",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@
|
||||||
(
|
(
|
||||||
let
|
let
|
||||||
cura5 = pkgs.appimageTools.wrapType2 rec {
|
cura5 = pkgs.appimageTools.wrapType2 rec {
|
||||||
pname = "cura5";
|
name = "cura5";
|
||||||
version = "5.8.0";
|
version = "5.8.0";
|
||||||
src = pkgs.fetchurl {
|
src = pkgs.fetchurl {
|
||||||
url = "https://github.com/Ultimaker/Cura/releases/download/${version}/UltiMaker-Cura-${version}-linux-X64.AppImage";
|
url = "https://github.com/Ultimaker/Cura/releases/download/${version}/UltiMaker-Cura-${version}-linux-X64.AppImage";
|
||||||
|
|
|
||||||
|
|
@ -881,8 +881,6 @@ This is meant to be an helper to be called from the window manager."
|
||||||
:custom
|
:custom
|
||||||
(gptel-api-key (lambda () (require 'f) (f-read-text (getenv "OPENAI_API_KEY_PATH"))))
|
(gptel-api-key (lambda () (require 'f) (f-read-text (getenv "OPENAI_API_KEY_PATH"))))
|
||||||
(gptel-model 'gpt-4o)
|
(gptel-model 'gpt-4o)
|
||||||
(gptel-default-mode 'org-mode)
|
|
||||||
(gptel-org-branching-context 't)
|
|
||||||
:config
|
:config
|
||||||
(require 'gptel-curl)
|
(require 'gptel-curl)
|
||||||
|
|
||||||
|
|
@ -921,9 +919,6 @@ This is meant to be an helper to be called from the window manager."
|
||||||
) ;; destroy frame on exit
|
) ;; destroy frame on exit
|
||||||
)
|
)
|
||||||
|
|
||||||
(use-package mixed-pitch
|
|
||||||
:hook (text-mode . mixed-pitch-mode))
|
|
||||||
|
|
||||||
(use-package pass
|
(use-package pass
|
||||||
:config
|
:config
|
||||||
(require 'password-store-otp) ;; FIXME use `use-pacakge' idiomatic way
|
(require 'password-store-otp) ;; FIXME use `use-pacakge' idiomatic way
|
||||||
|
|
@ -972,26 +967,5 @@ This is meant to be an helper to be called from the window manager."
|
||||||
(:name "GitHub" :query "tag:github" :key "g")
|
(:name "GitHub" :query "tag:github" :key "g")
|
||||||
(:name "Trash" :query "tag:trash" :key "t"))))
|
(:name "Trash" :query "tag:trash" :key "t"))))
|
||||||
|
|
||||||
;;; Experiments, remove from here
|
|
||||||
|
|
||||||
(defun ccr/test ()
|
|
||||||
"test"
|
|
||||||
(interactive)
|
|
||||||
(with-selected-frame
|
|
||||||
(make-frame '((name . "emacs-run-launcher")
|
|
||||||
(minibuffer . only)
|
|
||||||
(fullscreen . 0) ; no fullscreen
|
|
||||||
(undecorated . t) ; remove title bar
|
|
||||||
;;(auto-raise . t) ; focus on this frame
|
|
||||||
;;(tool-bar-lines . 0)
|
|
||||||
;;(menu-bar-lines . 0)
|
|
||||||
(internal-border-width . 10)
|
|
||||||
(width . 80)
|
|
||||||
(height . 11)))
|
|
||||||
(unwind-protect
|
|
||||||
(completing-read "ciao " '("foo" "bar") nil t "")
|
|
||||||
(delete-frame))))
|
|
||||||
|
|
||||||
|
|
||||||
(provide 'init)
|
(provide 'init)
|
||||||
;;; init.el ends here
|
;;; init.el ends here
|
||||||
|
|
|
||||||
|
|
@ -1,7 +0,0 @@
|
||||||
{ pkgs, ... }:
|
|
||||||
{
|
|
||||||
home.packages = [
|
|
||||||
pkgs.sdrangel
|
|
||||||
pkgs.kdePackages.qtlocation
|
|
||||||
];
|
|
||||||
}
|
|
||||||
|
|
@ -4,7 +4,6 @@
|
||||||
age,
|
age,
|
||||||
hostname,
|
hostname,
|
||||||
config,
|
config,
|
||||||
username,
|
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
{
|
{
|
||||||
|
|
@ -60,7 +59,7 @@
|
||||||
settings = {
|
settings = {
|
||||||
daemon = {
|
daemon = {
|
||||||
enabled = true;
|
enabled = true;
|
||||||
socket_path = "/home/${username}/.local/share/atuin/atuin.sock"; # FIXME using ~ or $HOME doesn't work: https://github.com/atuinsh/atuin/issues/2289
|
socket_path = "/home/ccr/.local/share/atuin/atuin.sock"; # FIXME using ~ or $HOME doesn't work: https://github.com/atuinsh/atuin/issues/2289
|
||||||
};
|
};
|
||||||
auto_sync = true;
|
auto_sync = true;
|
||||||
sync_frequency = "5m";
|
sync_frequency = "5m";
|
||||||
|
|
|
||||||
|
|
@ -119,20 +119,6 @@
|
||||||
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
tpol = {
|
|
||||||
extraModules = with inputs; [
|
|
||||||
lix-module.nixosModules.default
|
|
||||||
];
|
|
||||||
secrets = {
|
|
||||||
"tpol-wireguard-private-key" = { };
|
|
||||||
};
|
|
||||||
vpn = {
|
|
||||||
ip = "10.100.0.7";
|
|
||||||
publicKey = "b/Pi7koTFo5CMAAzcL2ulvQ/0dUjKzbmXpvh4Lb/Bgo=";
|
|
||||||
};
|
|
||||||
extraHmModulesUser = "mara";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
vpnExtra = {
|
vpnExtra = {
|
||||||
|
|
|
||||||
|
|
@ -40,7 +40,7 @@
|
||||||
|
|
||||||
ccr = {
|
ccr = {
|
||||||
enable = true;
|
enable = true;
|
||||||
autologin = false;
|
autologin = true;
|
||||||
modules = [
|
modules = [
|
||||||
"git"
|
"git"
|
||||||
"git-workspace"
|
"git-workspace"
|
||||||
|
|
@ -72,8 +72,6 @@
|
||||||
"catppuccin"
|
"catppuccin"
|
||||||
"libreoffice"
|
"libreoffice"
|
||||||
"emacs"
|
"emacs"
|
||||||
"chirp"
|
|
||||||
"sdrangel"
|
|
||||||
];
|
];
|
||||||
extraGroups = [ ];
|
extraGroups = [ ];
|
||||||
backupPaths = [ ];
|
backupPaths = [ ];
|
||||||
|
|
@ -101,7 +99,6 @@
|
||||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||||
powerManagement.cpuFreqGovernor = lib.mkDefault "schedutil";
|
powerManagement.cpuFreqGovernor = lib.mkDefault "schedutil";
|
||||||
hardware.enableRedistributableFirmware = lib.mkDefault true;
|
hardware.enableRedistributableFirmware = lib.mkDefault true;
|
||||||
hardware.rtl-sdr.enable = true;
|
|
||||||
|
|
||||||
hardware.graphics = {
|
hardware.graphics = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
|
||||||
|
|
@ -91,9 +91,8 @@
|
||||||
"emacs"
|
"emacs"
|
||||||
"vial"
|
"vial"
|
||||||
"chirp"
|
"chirp"
|
||||||
"sdrangel"
|
|
||||||
];
|
];
|
||||||
extraGroups = [ "plugdev" ];
|
extraGroups = [ ];
|
||||||
backupPaths = [ ];
|
backupPaths = [ ];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -66,11 +66,8 @@ in
|
||||||
size = "100%";
|
size = "100%";
|
||||||
content = {
|
content = {
|
||||||
type = "filesystem";
|
type = "filesystem";
|
||||||
format = "xfs";
|
format = "bcachefs";
|
||||||
mountpoint = "/mnt/hd";
|
mountpoint = "/mnt/hd";
|
||||||
mountOptions = [
|
|
||||||
"nofail"
|
|
||||||
];
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,48 +0,0 @@
|
||||||
{
|
|
||||||
lib,
|
|
||||||
modulesPath,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
{
|
|
||||||
imports = [
|
|
||||||
"${modulesPath}/installer/sd-card/sd-image-aarch64.nix"
|
|
||||||
];
|
|
||||||
|
|
||||||
sdImage.compressImage = false;
|
|
||||||
|
|
||||||
nixpkgs = {
|
|
||||||
# hostPlatform = lib.mkDefault "armv6-linux";
|
|
||||||
# config = {
|
|
||||||
# allowUnfree = true;
|
|
||||||
# };
|
|
||||||
# overlays = [
|
|
||||||
# # Workaround: https://github.com/NixOS/nixpkgs/issues/154163
|
|
||||||
# # modprobe: FATAL: Module sun4i-drm not found in directory
|
|
||||||
# (final: super: {
|
|
||||||
# makeModulesClosure = x:
|
|
||||||
# super.makeModulesClosure (x // {allowMissing = true;});
|
|
||||||
# })
|
|
||||||
# ];
|
|
||||||
};
|
|
||||||
|
|
||||||
fileSystems = {
|
|
||||||
"/" = {
|
|
||||||
device = "/dev/disk/by-label/NIXOS_SD";
|
|
||||||
fsType = "ext4";
|
|
||||||
options = [ "noatime" ];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
networking = {
|
|
||||||
networkmanager.enable = false;
|
|
||||||
};
|
|
||||||
|
|
||||||
# Set your time zone.
|
|
||||||
time.timeZone = "Europe/Rome";
|
|
||||||
|
|
||||||
# Allow the user to log in as root without a password.
|
|
||||||
users.users.root.initialHashedPassword = "";
|
|
||||||
|
|
||||||
hardware.enableRedistributableFirmware = true;
|
|
||||||
system.stateVersion = "24.11";
|
|
||||||
}
|
|
||||||
|
|
@ -1,94 +0,0 @@
|
||||||
{
|
|
||||||
modulesPath,
|
|
||||||
fleetModules,
|
|
||||||
pkgs,
|
|
||||||
lib,
|
|
||||||
vpn,
|
|
||||||
config,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
{
|
|
||||||
imports =
|
|
||||||
[ (modulesPath + "/installer/scan/not-detected.nix") ]
|
|
||||||
++ fleetModules [
|
|
||||||
"common"
|
|
||||||
"ssh"
|
|
||||||
"nix"
|
|
||||||
"networkmanager"
|
|
||||||
"dbus"
|
|
||||||
"udisks2"
|
|
||||||
"xdg"
|
|
||||||
"printing"
|
|
||||||
"mara"
|
|
||||||
"xfce"
|
|
||||||
"battery"
|
|
||||||
"printing"
|
|
||||||
"wireguard-client"
|
|
||||||
];
|
|
||||||
|
|
||||||
boot.initrd.availableKernelModules = [
|
|
||||||
"xhci_pci"
|
|
||||||
"ehci_pci"
|
|
||||||
"ahci"
|
|
||||||
"usb_storage"
|
|
||||||
"sd_mod"
|
|
||||||
"sr_mod"
|
|
||||||
"rtsx_pci_sdmmc"
|
|
||||||
];
|
|
||||||
boot.initrd.kernelModules = [ ];
|
|
||||||
boot.kernelModules = [ "kvm-intel" ];
|
|
||||||
boot.extraModulePackages = [ ];
|
|
||||||
boot.loader.grub.device = "/dev/sda";
|
|
||||||
|
|
||||||
fileSystems."/" = {
|
|
||||||
device = "/dev/disk/by-uuid/1522f8d9-5251-408d-9b6e-ed6da7da916a";
|
|
||||||
fsType = "btrfs";
|
|
||||||
};
|
|
||||||
|
|
||||||
swapDevices = [
|
|
||||||
{ device = "/dev/disk/by-uuid/e111fbc7-8e5d-4fcb-95c9-249f53ab0adc"; }
|
|
||||||
];
|
|
||||||
|
|
||||||
mara = {
|
|
||||||
enable = true;
|
|
||||||
modules = [
|
|
||||||
"shell"
|
|
||||||
"mpv"
|
|
||||||
"firefox"
|
|
||||||
"git"
|
|
||||||
"chrome"
|
|
||||||
"udiskie"
|
|
||||||
"helix"
|
|
||||||
"remmina"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
# nevertheless this is a laptop the battery is completely gone, so it works only attached to electrictiy
|
|
||||||
powerManagement.cpuFreqGovernor = lib.mkDefault "performance";
|
|
||||||
|
|
||||||
networking.firewall.allowedTCPPorts = [ 1234 ];
|
|
||||||
|
|
||||||
hardware.rtl-sdr.enable = true;
|
|
||||||
|
|
||||||
systemd.services.rtl-tcp = {
|
|
||||||
description = "rtl_sdr over TCP";
|
|
||||||
wantedBy = [ "multi-user.target" ];
|
|
||||||
serviceConfig = {
|
|
||||||
ExecStart = ''
|
|
||||||
${lib.getExe' pkgs.rtl-sdr "rtl_tcp"} -a ${vpn.${config.networking.hostName}}
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
systemd.services.sdrangelsrv = {
|
|
||||||
description = "sdrangelsrv";
|
|
||||||
wantedBy = [ "multi-user.target" ];
|
|
||||||
serviceConfig = {
|
|
||||||
ExecStart = ''
|
|
||||||
${lib.getExe' pkgs.sdrangel "sdrangelsrv"} --remote-tcp-hwtype RTLSDR --remote-tcp-port 1234 --remote-tcp-address ${
|
|
||||||
vpn.${config.networking.hostName}
|
|
||||||
} --remote-tcp
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -12,7 +12,6 @@
|
||||||
pbp = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFF05LScu9m5BXMlFAT1g+g/AkAi7kvq1dY6W3Rzqq3f";
|
pbp = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFF05LScu9m5BXMlFAT1g+g/AkAi7kvq1dY6W3Rzqq3f";
|
||||||
picard = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ1+1z1IsLVJ6aGarMgzw3NbmFKcpYVgdUjl7xDsewxT";
|
picard = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ1+1z1IsLVJ6aGarMgzw3NbmFKcpYVgdUjl7xDsewxT";
|
||||||
deltaflyer = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPETMwELvGTnhKJbpK0oFs4lK8vm/kV9KdgL9wufYDDQ";
|
deltaflyer = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPETMwELvGTnhKJbpK0oFs4lK8vm/kV9KdgL9wufYDDQ";
|
||||||
tpol = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIQxHSow2l0TDWTonBPPaGvTgVvMS/xsQOf1nHnvLSwV";
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -3,10 +3,9 @@
|
||||||
"i686-linux"
|
"i686-linux"
|
||||||
"aarch64-linux"
|
"aarch64-linux"
|
||||||
"riscv64-linux"
|
"riscv64-linux"
|
||||||
"armv6l-linux"
|
|
||||||
];
|
];
|
||||||
nix.extraOptions = ''
|
nix.extraOptions = ''
|
||||||
extra-platforms = aarch64-linux arm-linux i686-linux riscv64-linux armv6l-linux
|
extra-platforms = aarch64-linux arm-linux i686-linux riscv64-linux
|
||||||
'';
|
'';
|
||||||
|
|
||||||
# XXX For some reason `docker buildx` isn't aware of this:
|
# XXX For some reason `docker buildx` isn't aware of this:
|
||||||
|
|
|
||||||
|
|
@ -86,7 +86,6 @@ in
|
||||||
"dialout"
|
"dialout"
|
||||||
"systemd-journal"
|
"systemd-journal"
|
||||||
"camera"
|
"camera"
|
||||||
"networkmanager"
|
|
||||||
];
|
];
|
||||||
ccr.modules = [
|
ccr.modules = [
|
||||||
"shell"
|
"shell"
|
||||||
|
|
|
||||||
|
|
@ -1,21 +1,19 @@
|
||||||
{ pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
{
|
{
|
||||||
fonts = {
|
fonts = {
|
||||||
packages =
|
packages = with pkgs; [
|
||||||
with pkgs;
|
powerline-fonts
|
||||||
[
|
dejavu_fonts
|
||||||
powerline-fonts
|
fira-code
|
||||||
dejavu_fonts
|
fira-code-symbols
|
||||||
fira-code
|
iosevka
|
||||||
fira-code-symbols
|
iosevka-comfy.comfy
|
||||||
iosevka
|
emacs-all-the-icons-fonts
|
||||||
iosevka-comfy.comfy
|
nerdfonts
|
||||||
emacs-all-the-icons-fonts
|
joypixels
|
||||||
joypixels
|
etBook
|
||||||
etBook
|
vegur
|
||||||
vegur
|
];
|
||||||
]
|
|
||||||
++ (builtins.filter lib.attrsets.isDerivation (builtins.attrValues nerd-fonts));
|
|
||||||
fontconfig.defaultFonts = {
|
fontconfig.defaultFonts = {
|
||||||
monospace = [ "DejaVu Sans Mono for Powerline" ];
|
monospace = [ "DejaVu Sans Mono for Powerline" ];
|
||||||
sansSerif = [ "DejaVu Sans" ];
|
sansSerif = [ "DejaVu Sans" ];
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,6 @@
|
||||||
pkgs,
|
pkgs,
|
||||||
fleetHmModules,
|
fleetHmModules,
|
||||||
fleetFlake,
|
fleetFlake,
|
||||||
vpn,
|
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
{
|
{
|
||||||
|
|
@ -47,33 +46,20 @@
|
||||||
default = [
|
default = [
|
||||||
"wheel"
|
"wheel"
|
||||||
"fuse"
|
"fuse"
|
||||||
"video"
|
|
||||||
"dialout"
|
|
||||||
"systemd-journal"
|
|
||||||
"camera"
|
|
||||||
"networkmanager"
|
"networkmanager"
|
||||||
|
"dialout"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
config = lib.mkIf config.mara.enable {
|
config = lib.mkIf config.mara.enable {
|
||||||
|
|
||||||
programs.fish.enable = true;
|
|
||||||
|
|
||||||
mara.modules = [
|
|
||||||
"shell"
|
|
||||||
"git"
|
|
||||||
"nix-index"
|
|
||||||
"btop"
|
|
||||||
];
|
|
||||||
|
|
||||||
users.users.mara = {
|
users.users.mara = {
|
||||||
uid = 1001;
|
uid = 1001;
|
||||||
inherit (config.mara) hashedPassword;
|
inherit (config.mara) hashedPassword;
|
||||||
description = "Mara Savastano";
|
description = "Mara Savastano";
|
||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
inherit (config.mara) extraGroups;
|
inherit (config.mara) extraGroups;
|
||||||
shell = pkgs.fish;
|
shell = pkgs.nushell;
|
||||||
openssh.authorizedKeys.keys = config.mara.authorizedKeys;
|
openssh.authorizedKeys.keys = config.mara.authorizedKeys;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -82,16 +68,7 @@
|
||||||
home-manager.useGlobalPkgs = true;
|
home-manager.useGlobalPkgs = true;
|
||||||
home-manager.useUserPackages = true;
|
home-manager.useUserPackages = true;
|
||||||
home-manager.users.mara = {
|
home-manager.users.mara = {
|
||||||
imports = fleetHmModules config.mara.modules ++ [
|
imports = fleetHmModules config.mara.modules;
|
||||||
{
|
|
||||||
_module.args = {
|
|
||||||
inherit (config.age) secrets;
|
|
||||||
inherit vpn;
|
|
||||||
username = "mara";
|
|
||||||
hostname = config.networking.hostName;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
];
|
|
||||||
home.packages = config.mara.packages;
|
home.packages = config.mara.packages;
|
||||||
home.stateVersion = config.system.stateVersion;
|
home.stateVersion = config.system.stateVersion;
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
{ lib, ... }:
|
{ lib, ... }:
|
||||||
{
|
{
|
||||||
networking.networkmanager.enable = true;
|
networking.networkmanager.enable = true;
|
||||||
|
ccr.extraGroups = [ "networkmanager" ];
|
||||||
networking.useDHCP = lib.mkDefault true;
|
networking.useDHCP = lib.mkDefault true;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -5,11 +5,10 @@
|
||||||
xterm.enable = false;
|
xterm.enable = false;
|
||||||
xfce.enable = true;
|
xfce.enable = true;
|
||||||
};
|
};
|
||||||
};
|
displayManager = {
|
||||||
|
defaultSession = "xfce";
|
||||||
services.displayManager = {
|
autoLogin.user = "mara";
|
||||||
defaultSession = "xfce";
|
};
|
||||||
autoLogin.user = "mara";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
home-manager.users.mara.home.file."background-image" = {
|
home-manager.users.mara.home.file."background-image" = {
|
||||||
|
|
|
||||||
|
|
@ -118,7 +118,6 @@ let
|
||||||
solidity-mode
|
solidity-mode
|
||||||
telega
|
telega
|
||||||
aggressive-indent
|
aggressive-indent
|
||||||
mixed-pitch
|
|
||||||
# org-re-reveal # FIXME very not nice hash mismatch when building
|
# org-re-reveal # FIXME very not nice hash mismatch when building
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -182,8 +182,4 @@ with keys.users;
|
||||||
|
|
||||||
deltaflyer
|
deltaflyer
|
||||||
];
|
];
|
||||||
"tpol-wireguard-private-key.age".publicKeys = [
|
|
||||||
ccr-ssh
|
|
||||||
tpol
|
|
||||||
];
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,17 +0,0 @@
|
||||||
age-encryption.org/v1
|
|
||||||
-> ssh-rsa /AagBw
|
|
||||||
qUiTcrs0L+daa9FAsa80rdJsZCKCJN76KREz7mU7FF3ZBGp4VvisP4hJSjNKheWW
|
|
||||||
pfVaefXfuIsw2GvGqUjNZMGHj650gGEqMtO6nLuetMuCIWF7uTdPpnNQMK6BB2ni
|
|
||||||
Wlfu2g4rul6aV+S6KNiVBqlKJn521TOkEutsXFjaAJpnRVOG50P/8k9fPzjXNZnj
|
|
||||||
NqmMhGjOE8tDs9TM1nWM4yYDX3KMDULvcBHycV3yQRzswEJc4jq9oLS8SbyE+4Hy
|
|
||||||
dH6hkWLiRMz06Xg4F0XifGY4lglcMiQqNdNe5xMZtuR33Z1GUiY9HGU5FvXmUbQx
|
|
||||||
HTWTklzH8q0vdEmb2tFftCM8AMeodI3CLBt+DNlQ3V0+izUmOJwTGz5OGfT6SiWY
|
|
||||||
epMF5kXmZipWu5KsEoY1hv1INvGR84LyicpOT2vPV7cakx9ahlCgV5vhdmcAZy5F
|
|
||||||
CRAhnvIsZZMHwGV9lmAMI93wgPyU0ybtwjSpPbHAqv0DQj+CBrEY5ict3+HhSe5J
|
|
||||||
QrfcLRsQRox3QuR/jQvixBX63qNaezYFmpBuWP7XI7PuPj7KdUgECNfMctcVmCSb
|
|
||||||
xHKmYkf8I8Si1doFOZbYOXheiI/zNk0xLAONPI+LQ6ZemUODhpcpRSSkhcDKQdtC
|
|
||||||
srxvyTvYOk4IFjmjuk2JyE1Vp6wg+aiySZlyfFA7WQY
|
|
||||||
-> ssh-ed25519 X7Q5KQ UoryJKCMOKeAkI1dbz8On5q0wSd+XIUCdWI31gyS6D4
|
|
||||||
exrVhh9tGzQyToDKcv5sspbeKhdTp1q0wKuHWo+onKQ
|
|
||||||
--- QkkySHHmaJFZu2BNT0ZZ9NZipUbFqyzxL32YZx5DRbQ
|
|
||||||
wc¿^«Ò[v$jªš”ž7Lmt´{<7B>øù`¾ü0©—]ÿ¸lè<6C>¾…–3¢ñ<C2A2>…ã
šð{C²\µ±ßXƒZ §Œ°¸)Z$¿4d›„/.L
|
|
||||||
Loading…
Add table
Reference in a new issue