Luj/snowfield
1
0
Fork 0
mirror of https://github.com/JulienMalka/snowfield.git synced 2025-04-01 17:50:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge

Browse source
This commit is contained in:
Julien Malka 2023-06-10 23:51:49 +02:00
commit 3298173246
Signed by: Luj
GPG key ID: 6FC74C847011FD83
11 changed files with 102 additions and 155 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
base.nix
View file

@ -26,11 +26,13 @@
rxvt_unicode rxvt_unicode
xorg.xbacklight xorg.xbacklight
neovim neovim
comma
]; ];
environment.variables.EDITOR = "nvim"; environment.variables.EDITOR = "nvim";
programs.command-not-found.enable = false;
programs.nix-index-database.comma.enable = true;
networking.firewall.checkReversePath = "loose"; networking.firewall.checkReversePath = "loose";
systemd.services.NetworkManager-wait-online.enable = false; systemd.services.NetworkManager-wait-online.enable = false;

137
flake.lock generated
View file

@ -85,11 +85,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1683779844, "lastModified": 1685948350,
"narHash": "sha256-sIeOU0GsCeQEn5TpqE/jFRN4EGsPsjqVRsPdrzIDABM=", "narHash": "sha256-1FldJ059so0X/rScdbIiOlQbjjSNCCTdj2cUr5pHU4A=",
"owner": "serokell", "owner": "serokell",
"repo": "deploy-rs", "repo": "deploy-rs",
"rev": "c80189917086e43d49eece2bd86f56813500a0eb", "rev": "65211db63ba1199f09b4c9f27e5eba5ec50d76ac",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -165,45 +165,23 @@
} }
}, },
"home-manager": { "home-manager": {
"inputs": {
"nixpkgs": [
"unstable"
],
"utils": "utils"
},
"locked": {
"lastModified": 1681092193,
"narHash": "sha256-JerCqqOqbT2tBnXQW4EqwFl0hHnuZp21rIQ6lu/N4rI=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "f9edbedaf015013eb35f8caacbe0c9666bbc16af",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "release-22.11",
"repo": "home-manager",
"type": "github"
}
},
"home-manager-unstable": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"unstable" "unstable"
] ]
}, },
"locked": { "locked": {
"lastModified": 1681586242, "lastModified": 1685599623,
"narHash": "sha256-2TPuYRCm+snJgZTH2yw4VEXUyYRugir69I1uS5uONx0=", "narHash": "sha256-Tob4CMOVHue0D3RzguDBCtUmX5ji2PsdbQDbIOIKvsc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "75f4f362e1b5ebdc4076fcbdb4188b4fd736187c", "rev": "93db05480c0c0f30382d3e80779e8386dcb4f9dd",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-23.05",
"repo": "home-manager", "repo": "home-manager",
"rev": "75f4f362e1b5ebdc4076fcbdb4188b4fd736187c",
"type": "github" "type": "github"
} }
}, },
@ -231,11 +209,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1685632091, "lastModified": 1686306040,
"narHash": "sha256-RAfDARolNWT4ZF8IH6WwVd2s0jMuaA9zUPeb+I8/L1A=", "narHash": "sha256-pkS/Cz4yLUsl3ITipjmAolRpK7PS4c893VtUNMdHWf8=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "9cf72a30fc040f0bd2fb4651ec7f8e82df962278", "rev": "cf37922d4285689990a648bc02aecb90a07a36ba",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -270,11 +248,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1685378141, "lastModified": 1685950944,
"narHash": "sha256-/ehJbAtSJS86NlqHVOeR2ViBKlImKH4guFVPacTmCr8=", "narHash": "sha256-59by/hDMxPhq2KLRdjL5n5HoQjbfLdpykOa7BG6gEYw=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprpaper", "repo": "hyprpaper",
"rev": "cd86c196f3500f20539754d347c8378349ca0974", "rev": "64d0ebd66652a5614b645b1ffb4d592ba50d532a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -347,6 +325,26 @@
"type": "github" "type": "github"
} }
}, },
"nix-index-database": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1685764721,
"narHash": "sha256-CIy1iwQTEKfZRrid4gBLA+r/LPGA9IUFo0lKJVyECGI=",
"owner": "Mic92",
"repo": "nix-index-database",
"rev": "669ca1f2e2bc401abab6b837ae9c51503edc9b49",
"type": "github"
},
"original": {
"owner": "Mic92",
"repo": "nix-index-database",
"type": "github"
}
},
"nix-rfc-92": { "nix-rfc-92": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_3", "flake-compat": "flake-compat_3",
@ -375,11 +373,11 @@
"rust-overlay": "rust-overlay_3" "rust-overlay": "rust-overlay_3"
}, },
"locked": { "locked": {
"lastModified": 1683434835, "lastModified": 1686194558,
"narHash": "sha256-idBmY6LKkB5hTcTFroUi1oQdCK1/fDfJA+qNaivl1Wk=", "narHash": "sha256-ZEgCpLJ95TJ66A8QPgaetafhw9G7/mq8vZZFX2672Xg=",
"owner": "tpwrules", "owner": "tpwrules",
"repo": "nixos-apple-silicon", "repo": "nixos-apple-silicon",
"rev": "ef6f0de57ef175e0de8c7e846a95481ac6f4ce58", "rev": "6b08b1821c45601c6833c9e5e391c0ab777631a5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -390,11 +388,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1685383865, "lastModified": 1685655444,
"narHash": "sha256-3uQytfnotO6QJv3r04ajSXbEFMII0dUtw0uqYlZ4dbk=", "narHash": "sha256-6EujQNAeaUkWvpEZZcVF8qSfQrNVWFNNGbUJxv/A5a8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5e871d8aa6f57cc8e0dc087d1c5013f6e212b4ce", "rev": "e635192892f5abbc2289eaac3a73cdb249abaefd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -454,32 +452,32 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1683286087, "lastModified": 1685931219,
"narHash": "sha256-xseOd7W7xwF5GOF2RW8qhjmVGrKoBz+caBlreaNzoeI=", "narHash": "sha256-8EWeOZ6LKQfgAjB/USffUSELPRjw88A+xTcXnOUvO5M=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3e313808bd2e0a0669430787fb22e43b2f4bf8bf", "rev": "7409480d5c8584a1a83c422530419efe4afb0d19",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3e313808bd2e0a0669430787fb22e43b2f4bf8bf", "rev": "7409480d5c8584a1a83c422530419efe4afb0d19",
"type": "github" "type": "github"
} }
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1685468986, "lastModified": 1686237827,
"narHash": "sha256-YSj3K71KjRZgeL0hS3sYLYHI0g8aIVIf9lcsRMCIW2A=", "narHash": "sha256-fAZB+Zkcmc+qlauiFnIH9+2qgwM0NO/ru5pWEw3tDow=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9af373a61647257d16ae6062cddaa9094d24920c", "rev": "81ed90058a851eb73be835c770e062c6938c8a9e",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-22.11", "ref": "nixos-23.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -490,12 +488,12 @@
"deploy-rs": "deploy-rs", "deploy-rs": "deploy-rs",
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"home-manager": "home-manager", "home-manager": "home-manager",
"home-manager-unstable": "home-manager-unstable",
"homepage": "homepage", "homepage": "homepage",
"hyprland": "hyprland", "hyprland": "hyprland",
"hyprpaper": "hyprpaper", "hyprpaper": "hyprpaper",
"linkal": "linkal", "linkal": "linkal",
"nil": "nil", "nil": "nil",
"nix-index-database": "nix-index-database",
"nix-rfc-92": "nix-rfc-92", "nix-rfc-92": "nix-rfc-92",
"nixos-apple-silicon": "nixos-apple-silicon", "nixos-apple-silicon": "nixos-apple-silicon",
"nixpkgs": "nixpkgs_5", "nixpkgs": "nixpkgs_5",
@ -559,11 +557,11 @@
"rust-overlay_3": { "rust-overlay_3": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1675132198, "lastModified": 1686105195,
"narHash": "sha256-izOVjdIfdv0OzcfO9rXX0lfGkQn4tdJ0eNm3P3LYo/o=", "narHash": "sha256-tBTKW+oqfT86Mvq/nm8Tkk3pzhJFXJWXJrj71cTF7lE=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "48b1403150c3f5a9aeee8bc4c77c8926f29c6501", "rev": "1279a72003f5e4b08c8eca1101d8f57452a539f9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -610,11 +608,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1685434555, "lastModified": 1685848844,
"narHash": "sha256-aZl0yeaYX3T2L3W3yXOd3S9OfpS+8YUOT2b1KwrSf6E=", "narHash": "sha256-Iury+/SVbAwLES76QJSiKFiQDzmf/8Hsq8j54WF2qyw=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "876846cde9762ae563f018c17993354875e2538e", "rev": "a522e12ee35e50fa7d902a164a9796e420e6e75b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -640,11 +638,11 @@
}, },
"unstable": { "unstable": {
"locked": { "locked": {
"lastModified": 1685564631, "lastModified": 1686226982,
"narHash": "sha256-8ywr3AkblY4++3lIVxmrWZFzac7+f32ZEhH/A8pNscI=", "narHash": "sha256-nLuiPoeiVfqqzeq9rmXxpybh77VS37dsY/k8N2LoxVg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4f53efe34b3a8877ac923b9350c874e3dcd5dc0a", "rev": "a64b73e07d4aa65cfcbda29ecf78eaf9e72e44bd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -654,30 +652,15 @@
"type": "github" "type": "github"
} }
}, },
"utils": {
"locked": {
"lastModified": 1667395993,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"wlroots": { "wlroots": {
"flake": false, "flake": false,
"locked": { "locked": {
"host": "gitlab.freedesktop.org", "host": "gitlab.freedesktop.org",
"lastModified": 1685491729, "lastModified": 1685803001,
"narHash": "sha256-YfpP8tKpcr0Lxlr3PdoMaY3GD/uJRl6E5pp5KQCEuzg=", "narHash": "sha256-yxq/U9zL1ssFZtgT27A96UKteCiKb3zSmbA/dokK76U=",
"owner": "wlroots", "owner": "wlroots",
"repo": "wlroots", "repo": "wlroots",
"rev": "3f0487d310974f6ff889ca80e4fb4005553814ed", "rev": "b61d5922f1d0910a848deb100570ad8587aea38d",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {

22
flake.nix
View file

@ -2,17 +2,10 @@
description = "A flake for my personnal configurations"; description = "A flake for my personnal configurations";
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05";
flake-utils.url = "github:numtide/flake-utils";
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-22.11"; url = "github:nix-community/home-manager/release-23.05";
inputs.nixpkgs.follows = "unstable";
};
home-manager-unstable = {
url = "github:nix-community/home-manager/75f4f362e1b5ebdc4076fcbdb4188b4fd736187c";
inputs.nixpkgs.follows = "unstable"; inputs.nixpkgs.follows = "unstable";
}; };
@ -25,10 +18,12 @@
url = "github:NixOS/nixpkgs/nixos-unstable"; url = "github:NixOS/nixpkgs/nixos-unstable";
}; };
flake-utils.url = "github:numtide/flake-utils";
deploy-rs = { deploy-rs = {
url = "github:serokell/deploy-rs"; url = "github:serokell/deploy-rs";
inputs.utils.follows = "flake-utils";
inputs.nixpkgs.follows = "unstable"; inputs.nixpkgs.follows = "unstable";
inputs.utils.follows = "flake-utils";
}; };
sops-nix = { sops-nix = {
@ -75,6 +70,12 @@
inputs.nixpkgs.follows = "unstable"; inputs.nixpkgs.follows = "unstable";
}; };
nix-index-database =
{
url = "github:Mic92/nix-index-database";
inputs.nixpkgs.follows = "nixpkgs";
};
nix-rfc-92.url = "github:obsidiansystems/nix/dynamic-drvs"; nix-rfc-92.url = "github:obsidiansystems/nix/dynamic-drvs";
}; };
@ -239,7 +240,6 @@
machines.lisa = self.nixosConfigurations.lisa.config.system.build.toplevel; machines.lisa = self.nixosConfigurations.lisa.config.system.build.toplevel;
machines.macintosh = self.nixosConfigurations.macintosh.config.system.build.toplevel; machines.macintosh = self.nixosConfigurations.macintosh.config.system.build.toplevel;
machines.lambda = self.nixosConfigurations.lambda.config.system.build.toplevel; machines.lambda = self.nixosConfigurations.lambda.config.system.build.toplevel;
machines.bin-cache = self.nixosConfigurations.bin-cache.config.system.build.toplevel;
packages.x86_64-linux = packages.x86_64-linux; packages.x86_64-linux = packages.x86_64-linux;
packages.aarch64-linux = packages.aarch64-linux; packages.aarch64-linux = packages.aarch64-linux;
}; };

8
home-manager-modules/hyprland/default.nix
View file

@ -21,6 +21,12 @@ with lib;
xdg.configFile."hypr/hyprland.conf".text = '' xdg.configFile."hypr/hyprland.conf".text = ''
exec-once = waybar & hyprpaper exec-once = waybar & hyprpaper
exec-once=dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY exec-once=dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY
exec swayidle -w \
timeout 300 'swaylock -f -c 000000' \
timeout 600 'swaymsg "output * dpms off"' \
resume 'swaymsg "output * dpms on"' \
before-sleep 'swaylock -f -c 000000'
exec-once = nm-applet --indicator exec-once = nm-applet --indicator
# Monitors # Monitors
monitor = eDP-1, preferred, auto, auto monitor = eDP-1, preferred, auto, auto
@ -164,7 +170,7 @@ with lib;
home.packages = with pkgs; [ qt6.qtwayland libsForQt5.qt5.qtwayland hyprpaper swaylock ]; home.packages = with pkgs; [ qt6.qtwayland libsForQt5.qt5.qtwayland hyprpaper swaylock swayidle ];
}; };
} }

39
home-manager-modules/ssh-client/default.nix
View file

@ -12,21 +12,6 @@ with lib;
programs.ssh = { programs.ssh = {
enable = true; enable = true;
matchBlocks = { matchBlocks = {
newton = {
hostname = "newton.julienmalka.me";
user = "julien";
port = 45;
};
lisa = {
hostname = "lisa.julienmalka.me";
user = "julien";
port = 45;
};
newton-init = {
hostname = "newton.julienmalka.me";
user = "root";
port = 2222;
};
sas = { sas = {
hostname = "sas.eleves.ens.fr"; hostname = "sas.eleves.ens.fr";
user = "jmalka"; user = "jmalka";
@ -36,30 +21,6 @@ with lib;
user = "root"; user = "root";
port = 45; port = 45;
}; };
tower = {
hostname = "tower.julienmalka.me";
user = "julien";
port = 45;
};
saumon = {
hostname = "saumon.julienmalka.me";
user = "julien";
};
stockly = {
hostname = "charybdis.stockly.tech";
user = "julien_malka";
port = 23;
};
curry = {
hostname = "vms.julienmalka.me";
user = "julien";
port = 60;
};
mails = {
hostname = "192.168.1.78";
user = "julien";
proxyJump = "curry";
};
}; };
}; };
}; };

1
lib/default.nix
View file

@ -24,6 +24,7 @@ in
inputs.simple-nixos-mailserver.nixosModule inputs.simple-nixos-mailserver.nixosModule
inputs.hyprland.nixosModules.default inputs.hyprland.nixosModules.default
inputs.attic.nixosModules.atticd inputs.attic.nixosModules.atticd
inputs.nix-index-database.nixosModules.nix-index
{ {
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
nixpkgs.overlays = [ nixpkgs.overlays = [

2
lib/luj.nix
View file

@ -37,7 +37,7 @@ inputs: lib: with lib; let
macintosh = { macintosh = {
arch = "aarch64-linux"; arch = "aarch64-linux";
nixpkgs_version = inputs.nixos-apple-silicon.inputs.nixpkgs; nixpkgs_version = inputs.nixos-apple-silicon.inputs.nixpkgs;
hm_version = inputs.home-manager-unstable; hm_version = inputs.home-manager;
}; };
lambda = { lambda = {
arch = "aarch64-linux"; arch = "aarch64-linux";

2
machines/bin-cache/default.nix
View file

@ -118,7 +118,7 @@ VfXtULncAiEA2gmqdr+ugFz5tvPdKwanroTiMTUMhhCRYVlQlyTApyQ=
services.openssh = { services.openssh = {
enable = true; enable = true;
ports = [ 45 ]; ports = [ 45 ];
permitRootLogin = "yes"; settings.PermitRootLogin = "yes";
openFirewall = true; openFirewall = true;
}; };

2
machines/lambda/default.nix
View file

@ -142,7 +142,7 @@ VfXtULncAiEA2gmqdr+ugFz5tvPdKwanroTiMTUMhhCRYVlQlyTApyQ=
services.openssh = { services.openssh = {
enable = true; enable = true;
ports = [ 45 ]; ports = [ 45 ];
permitRootLogin = "yes"; settings.PermitRootLogin = "yes";
openFirewall = true; openFirewall = true;
}; };

36
machines/macintosh/default.nix
View file

@ -1,7 +1,3 @@
# Edit this configuration file to define what should be installed on
# your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running ‘nixos-help’).
{ config, pkgs, lib, inputs, ... }: { config, pkgs, lib, inputs, ... }:
{ {
@ -15,12 +11,11 @@
inputs.nixos-apple-silicon.nixosModules.apple-silicon-support inputs.nixos-apple-silicon.nixosModules.apple-silicon-support
]; ];
# Use the systemd-boot EFI boot loader.
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = false; boot.loader.efi.canTouchEfiVariables = false;
nixpkgs.config.allowUnsupportedSystem = false; nixpkgs.config.allowUnsupportedSystem = false;
networking.hostName = "macintosh"; # Define your hostname. networking.hostName = "macintosh"; # Define your hostname.
# Pick only one of the below networking options.
networking.wireless.enable = false; networking.wireless.enable = false;
hardware.asahi.addEdgeKernelConfig = true; hardware.asahi.addEdgeKernelConfig = true;
@ -34,18 +29,24 @@
LIBSEAT_BACKEND = "logind"; LIBSEAT_BACKEND = "logind";
}; };
programs.fish.shellInit = '' services.xserver = {
if test -z (pgrep ssh-agent) enable = true;
eval (ssh-agent -c) > /dev/null layout = "fr";
set -Ux SSH_AUTH_SOCK $SSH_AUTH_SOCK displayManager.gdm.enable = true;
set -Ux SSH_AGENT_PID $SSH_AGENT_PID libinput = {
set -Ux SSH_AUTH_SOCK $SSH_AUTH_SOCK enable = true;
end naturalScrolling = true;
''; };
};
services.tailscale.enable = true; services.tailscale.enable = true;
networking.networkmanager.enable = true; # Easiest to use and most distros use this by default. networking.networkmanager.enable = true; # Easiest to use and most distros use this by default.
networking.networkmanager.dns = "systemd-resolved";
services.resolved.enable = true;
time.timeZone = "Europe/Paris"; time.timeZone = "Europe/Paris";
# Select internationalisation properties. # Select internationalisation properties.
@ -57,11 +58,6 @@
hardware.asahi.peripheralFirmwareDirectory = ./firmware; hardware.asahi.peripheralFirmwareDirectory = ./firmware;
services.xserver.libinput = {
enable = true;
naturalScrolling = true;
};
hardware.opengl.enable = true; hardware.opengl.enable = true;
hardware.opengl.driSupport = true; hardware.opengl.driSupport = true;
@ -88,8 +84,6 @@
security.pam.services.swaylock = { }; security.pam.services.swaylock = { };
services.gnome3.gnome-keyring.enable = true;
security.pam.services.login.enableGnomeKeyring = true;
programs.ssh.startAgent = true; programs.ssh.startAgent = true;
programs.adb.enable = true; programs.adb.enable = true;

4
modules/ssh-server/default.nix
View file

@ -13,8 +13,8 @@ with lib;
services.openssh = { services.openssh = {
enable = true; enable = true;
ports = [ 45 ]; ports = [ 45 ];
passwordAuthentication = false; settings.PasswordAuthentication = false;
permitRootLogin = "yes"; settings.PermitRootLogin = "yes";
openFirewall = true; openFirewall = true;
}; };
}; };