ellmau/nixos
1
0
Fork 0
mirror of https://github.com/ellmau/nixos.git synced 2025-12-21 09:49:39 +01:00
Code Issues Projects Releases Wiki Activity

Compare commits

base: ellmau:a27a93520fcd440f0897c1da93b55af9ad955b9a
Branches Tags
ellmau:main
ellmau:fix/zsh
ellmau:flake/packages
ellmau:release-23.05
ellmau:xmonad
ellmau:dap-mode
ellmau:service/gitea
ellmau:swayfy
ellmau:redesign/flake
..
compare: ellmau:746dfae62a9d90846dcc1ef524d597b2f11e42a0
Branches Tags
ellmau:main
ellmau:fix/zsh
ellmau:flake/packages
ellmau:release-23.05
ellmau:xmonad
ellmau:dap-mode
ellmau:service/gitea
ellmau:swayfy
ellmau:redesign/flake

No commits in common. "a27a93520fcd440f0897c1da93b55af9ad955b9a" and "746dfae62a9d90846dcc1ef524d597b2f11e42a0" have entirely different histories.
a27a93520f ... 746dfae62a

18 changed files with 516 additions and 571 deletions
Show Stats Expand all files Collapse all files

96
flake.lock generated
View File

@ -68,15 +68,14 @@
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ]
"nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1685614843, "lastModified": 1685412232,
"narHash": "sha256-FwQ0fhGPom0fKXdKJg6KNiKwTrK0fV3+6w9eE4YfG88=", "narHash": "sha256-Oifn6uAP+IS0jEGs50tlRBCIwtUVIN4f+8RdlxbvK88=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "dbb2bb4f40a27e2bba0bee5fe6f97e832a4583c6", "rev": "04f25058fbe3ae1aadd435aba49b66493e939f83",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -102,15 +101,12 @@
} }
}, },
"flake-utils": { "flake-utils": {
"inputs": {
"systems": "systems"
},
"locked": { "locked": {
"lastModified": 1685518550, "lastModified": 1667395993,
"narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -156,19 +152,20 @@
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ],
"utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1685599623, "lastModified": 1681092193,
"narHash": "sha256-Tob4CMOVHue0D3RzguDBCtUmX5ji2PsdbQDbIOIKvsc=", "narHash": "sha256-JerCqqOqbT2tBnXQW4EqwFl0hHnuZp21rIQ6lu/N4rI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "93db05480c0c0f30382d3e80779e8386dcb4f9dd", "rev": "f9edbedaf015013eb35f8caacbe0c9666bbc16af",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-23.05", "ref": "release-22.11",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -294,22 +291,6 @@
} }
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": {
"lastModified": 1685468986,
"narHash": "sha256-YSj3K71KjRZgeL0hS3sYLYHI0g8aIVIf9lcsRMCIW2A=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "9af373a61647257d16ae6062cddaa9094d24920c",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-22.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1685215858, "lastModified": 1685215858,
"narHash": "sha256-IRMFoDXA6cYx3ifVw3B2JcC4JrjT5v7tRAx2vro2Ffs=", "narHash": "sha256-IRMFoDXA6cYx3ifVw3B2JcC4JrjT5v7tRAx2vro2Ffs=",
@ -343,16 +324,16 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1685533922, "lastModified": 1685314633,
"narHash": "sha256-y4FCQpYafMQ42l1V+NUrMel9RtFtZo59PzdzflKR/lo=", "narHash": "sha256-8LXBPqTQXl5ofkjpJ18JcbmLJ/lWDoMxtUwiDYv0wro=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3a70dd92993182f8e514700ccf5b1ae9fc8a3b8d", "rev": "c8a17ce7abc03c50cd072e9e6c9b389c5f61836b",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-23.05", "ref": "nixos-22.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -378,7 +359,7 @@
"nixpkgs" "nixpkgs"
], ],
"nixpkgs-22_11": "nixpkgs-22_11", "nixpkgs-22_11": "nixpkgs-22_11",
"utils": "utils" "utils": "utils_2"
}, },
"locked": { "locked": {
"lastModified": 1671659164, "lastModified": 1671659164,
@ -400,14 +381,14 @@
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1685434555, "lastModified": 1685242617,
"narHash": "sha256-aZl0yeaYX3T2L3W3yXOd3S9OfpS+8YUOT2b1KwrSf6E=", "narHash": "sha256-UBPXGfGwGMJm2Wj9kDj8+TMMK2PTouSM/TpiXYtaqtQ=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "876846cde9762ae563f018c17993354875e2538e", "rev": "3e016341d4dca6ce7c62316f90e66341841a30f9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -417,37 +398,22 @@
"type": "github" "type": "github"
} }
}, },
"systems": { "utils": {
"locked": { "locked": {
"lastModified": 1681028828, "lastModified": 1667395993,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
"owner": "nix-systems", "owner": "numtide",
"repo": "default", "repo": "flake-utils",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-systems", "owner": "numtide",
"repo": "default", "repo": "flake-utils",
"type": "github" "type": "github"
} }
}, },
"utils": { "utils_2": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"utils": {
"locked": { "locked": {
"lastModified": 1605370193, "lastModified": 1605370193,
"narHash": "sha256-YyMTf3URDL/otKdKgtoMChu4vfVL3vCMkRqpGifhUn0=", "narHash": "sha256-YyMTf3URDL/otKdKgtoMChu4vfVL3vCMkRqpGifhUn0=",

71
flake.nix
View File

@ -1,8 +1,9 @@
{ {
description = "Flake to define configurations of 'elss' - ellmauthaler stefan's systems"; description =
"Flake to define configurations of 'elss' - ellmauthaler stefan's systems";
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11";
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
#nix = { #nix = {
@ -11,14 +12,14 @@
# inputs.nixpkgs.follows = "nixpkgs"; # inputs.nixpkgs.follows = "nixpkgs";
#}; #};
nixos-hardware = {url = "github:NixOS/nixos-hardware/master";}; nixos-hardware = { url = "github:NixOS/nixos-hardware/master"; };
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-23.05"; url = "github:nix-community/home-manager/release-22.11";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
flake-utils-plus = {url = "github:gytis-ivaskevicius/flake-utils-plus";}; flake-utils-plus = { url = "github:gytis-ivaskevicius/flake-utils-plus"; };
emacs-overlay = { emacs-overlay = {
url = "github:nix-community/emacs-overlay"; url = "github:nix-community/emacs-overlay";
@ -52,27 +53,16 @@
}; };
}; };
outputs = { outputs = { self, nixpkgs, flake-utils-plus, ... }@inputs:
self, let
nixpkgs, extended-lib = nixpkgs.lib.extend
flake-utils-plus, (final: prev: { elss = (import ./lib { lib = final; }) prev; });
... inherit (extended-lib.elss)
} @ inputs: let discoverModules moduleNames discoverMachines withModules
extended-lib = discoverTemplates;
nixpkgs.lib.extend in flake-utils-plus.lib.mkFlake rec {
(final: prev: {elss = (import ./lib {lib = final;}) prev;});
inherit
(extended-lib.elss)
discoverModules
moduleNames
discoverMachines
withModules
discoverTemplates
;
in
flake-utils-plus.lib.mkFlake rec {
inherit self inputs; inherit self inputs;
supportedSystems = ["x86_64-linux"]; supportedSystems = [ "x86_64-linux" ];
lib = extended-lib; lib = extended-lib;
@ -92,7 +82,7 @@
}; };
channels.nixpkgs.overlaysBuilder = channels: [ channels.nixpkgs.overlaysBuilder = channels: [
(final: prev: {unstable = channels.nixpkgs-unstable;}) (final: prev: { unstable = channels.nixpkgs-unstable; })
(flake-utils-plus.lib.genPkgOverlay inputs.comma "comma") (flake-utils-plus.lib.genPkgOverlay inputs.comma "comma")
#inputs.nix.overlay #inputs.nix.overlay
inputs.emacs-overlay.overlay inputs.emacs-overlay.overlay
@ -101,38 +91,32 @@
hostDefaults = { hostDefaults = {
system = "x86_64-linux"; system = "x86_64-linux";
channelName = "nixpkgs"; channelName = "nixpkgs";
modules = modules = [
[
inputs.home-manager.nixosModules.home-manager inputs.home-manager.nixosModules.home-manager
inputs.sops-nix.nixosModules.sops inputs.sops-nix.nixosModules.sops
inputs.dwarffs.nixosModules.dwarffs inputs.dwarffs.nixosModules.dwarffs
inputs.simple-nixos-mailserver.nixosModules.mailserver inputs.simple-nixos-mailserver.nixosModules.mailserver
./common/wireguard.nix ./common/wireguard.nix
] ] ++ (map (name: ./modules + "/${name}") (moduleNames ./modules));
++ (map (name: ./modules + "/${name}") (moduleNames ./modules));
specialArgs = { specialArgs = {
nixos-hardware = inputs.nixos-hardware.nixosModules; nixos-hardware = inputs.nixos-hardware.nixosModules;
inherit inputs; inherit inputs;
}; };
extraArgs = { extraArgs = {
homeConfigurations = withModules ./users ({ homeConfigurations = withModules ./users ({ name, path, }:
name,
path,
}:
#import (./users + "/${name}") #import (./users + "/${name}")
import path); import path);
}; };
}; };
hosts = hosts =
discoverMachines ./machines {specialArgs = {lib = extended-lib;};}; discoverMachines ./machines { specialArgs = { lib = extended-lib; }; };
nixosModules = discoverModules ./modules; nixosModules = discoverModules ./modules;
homeConfigurations = withModules ./users (name: let homeConfigurations = withModules ./users (name:
username = extended-lib.removeSuffix ".nix" name; let username = extended-lib.removeSuffix ".nix" name;
in in inputs.home-manager.lib.homeManagerConfiguration {
inputs.home-manager.lib.homeManagerConfiguration {
configuration = import (./users + "/${name}"); configuration = import (./users + "/${name}");
inherit username; inherit username;
system = "x86_64-linux"; system = "x86_64-linux";
@ -141,8 +125,7 @@
}); });
outputsBuilder = channels: { outputsBuilder = channels: {
devShells = let devShells = let pkgs = channels.nixpkgs;
pkgs = channels.nixpkgs;
in rec { in rec {
sops = import ./secrets/shell.nix { sops = import ./secrets/shell.nix {
pkgs = channels.nixpkgs; pkgs = channels.nixpkgs;
@ -181,12 +164,14 @@
templates = discoverTemplates ./templates { templates = discoverTemplates ./templates {
base = { base = {
description = "Basic setup of tools in nixpkgs/unstable"; description = "Basic setup of tools in nixpkgs/unstable";
welcomeText = "Change into the folder and add the wanted packages to the buildInputs"; welcomeText =
"Change into the folder and add the wanted packages to the buildInputs";
}; };
rust = { rust = {
description = "Rust development environment flake"; description = "Rust development environment flake";
welcomeText = "Change into the folder and follow the prompt to create an automatic rust environment in this folder"; welcomeText =
"Change into the folder and follow the prompt to create an automatic rust environment in this folder";
}; };
jupyter = { jupyter = {
description = "Jupyter server flake"; description = "Jupyter server flake";

10
machines/nucturne/hardware-configuration.nix
View File

@ -8,7 +8,9 @@
modulesPath, modulesPath,
... ...
}: { }: {
imports = [(modulesPath + "/installer/scan/not-detected.nix")]; imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" "sdhci_pci"]; boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" "sdhci_pci"];
boot.initrd.kernelModules = []; boot.initrd.kernelModules = [];
@ -30,7 +32,11 @@
fsType = "vfat"; fsType = "vfat";
}; };
swapDevices = [{device = "/dev/disk/by-uuid/0069f1fa-dd8e-4c0a-8f01-a576af29909e";}]; swapDevices = [
{device = "/dev/disk/by-uuid/0069f1fa-dd8e-4c0a-8f01-a576af29909e";}
];
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
# high-resolution display
hardware.video.hidpi.enable = lib.mkDefault true;
} }

10
machines/stel-xps/hardware-configuration.nix
View File

@ -8,7 +8,9 @@
modulesPath, modulesPath,
... ...
}: { }: {
imports = [(modulesPath + "/installer/scan/not-detected.nix")]; imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = ["xhci_pci" "nvme" "usbhid" "usb_storage" "sd_mod" "rtsx_pci_sdmmc"]; boot.initrd.availableKernelModules = ["xhci_pci" "nvme" "usbhid" "usb_storage" "sd_mod" "rtsx_pci_sdmmc"];
boot.initrd.kernelModules = []; boot.initrd.kernelModules = [];
@ -27,7 +29,11 @@
fsType = "vfat"; fsType = "vfat";
}; };
swapDevices = [{device = "/dev/disk/by-uuid/93381a25-6704-408e-b091-cfda6cddbda0";}]; swapDevices = [
{device = "/dev/disk/by-uuid/93381a25-6704-408e-b091-cfda6cddbda0";}
];
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
# high-resolution display
hardware.video.hidpi.enable = lib.mkDefault true;
} }

4
modules/emacs/default.el
View File

@ -630,9 +630,9 @@
(gofmt . ("gofmt")) (gofmt . ("gofmt"))
(google-java-format . ("google-java-format" "-")) (google-java-format . ("google-java-format" "-"))
(isort . ("isort" "-")) (isort . ("isort" "-"))
(latexindent . ("latexindent" "--logfile=/dev/null")) ;(latexindent . ("latexindent" "--logfile=/dev/null"))
(mix-format . ("mix" "format" "-")) (mix-format . ("mix" "format" "-"))
(nixfmt . ("alejandra" "-")) (nixfmt . ("nixfmt"))
(rustfmt . ("rustfmt" "--quiet" "--emit" "stdout")) (rustfmt . ("rustfmt" "--quiet" "--emit" "stdout"))
(terraform . ("terraform" "fmt" "-")))) (terraform . ("terraform" "fmt" "-"))))
:preface :preface

18
modules/server/gitea.nix
View File

@ -12,23 +12,27 @@ with lib; {
services.nginx.virtualHosts."git.ellmauthaler.net" = { services.nginx.virtualHosts."git.ellmauthaler.net" = {
enableACME = true; enableACME = true;
forceSSL = true; forceSSL = true;
locations."/" = {proxyPass = "http://localhost:3001";}; locations."/" = {
proxyPass = "http://localhost:3001";
};
}; };
services.gitea = { services.gitea = {
enable = true; enable = true;
settings.service = {DISABLE_REGISTRATION = true;}; settings.service = {
DISABLE_REGISTRATION = true;
};
appName = "gitea: ellmauthaler.net gitea service"; appName = "gitea: ellmauthaler.net gitea service";
database = { database = {
type = "postgres"; type = "postgres";
host = "/run/posgresql"; host = "/run/posgresql";
}; };
domain = "git.ellmauthaler.net";
rootUrl = "https://git.ellmauthaler.net";
httpPort = 3001;
settings = { settings = {
repository = {DEFAULT_BRANCH = "main";}; repository = {
server = { DEFAULT_BRANCH = "main";
ROOT_URL = "https://git.ellmauthaler.net";
HTTP_PORT = 3001;
DOMAIN = "git.ellmauthaler.net";
}; };
}; };
}; };

7
modules/server/grocy.nix
View File

@ -9,8 +9,7 @@ with lib; {
cfg = config.elss.server.grocy; cfg = config.elss.server.grocy;
in in
mkIf cfg.enable { mkIf cfg.enable {
services = { services.grocy = {
grocy = {
enable = true; enable = true;
hostName = "grocy.ellmauthaler.net"; hostName = "grocy.ellmauthaler.net";
settings = { settings = {
@ -23,8 +22,8 @@ with lib; {
}; };
}; };
nginx.virtualHosts."grocy.ellmauthaler.net" = {forceSSL = true;}; services.nginx.virtualHosts."grocy.ellmauthaler.net" = {
phpfpm.pools.grocy.phpPackage = mkForce pkgs.php81; forceSSL = true;
}; };
}; };
} }

2
modules/server/nextcloud.nix
View File

@ -12,7 +12,7 @@ with lib; {
elss.server.sql.enable = mkDefault true; elss.server.sql.enable = mkDefault true;
services.nextcloud = { services.nextcloud = {
enable = true; enable = true;
package = pkgs.nextcloud26; package = pkgs.nextcloud25;
hostName = "cloudstore.ellmauthaler.net"; hostName = "cloudstore.ellmauthaler.net";
https = true; https = true;
enableBrokenCiphersForSSE = false; enableBrokenCiphersForSSE = false;

6
modules/ssh.nix
View File

@ -13,10 +13,8 @@ with lib; {
mkIf cfg.enable { mkIf cfg.enable {
services.openssh = { services.openssh = {
enable = true; enable = true;
settings = { passwordAuthentication = false;
PasswordAuthentication = false; permitRootLogin = "no";
PermitRootLogin = "no";
};
}; };
}; };
} }

17
modules/xmonad.nix
View File

@ -1,14 +1,7 @@
{ { config, pkgs, lib, ... }:
config,
pkgs,
lib,
...
}:
with lib; { with lib; {
config = let config = let cfg = config.elss.graphical.xmonad;
cfg = config.elss.graphical.xmonad; in mkIf cfg.enable {
in
mkIf cfg.enable {
elss.graphical.xserver = { elss.graphical.xserver = {
enable = true; enable = true;
autorandr.enable = true; autorandr.enable = true;
@ -24,7 +17,7 @@ with lib; {
displayManager.defaultSession = "none+xmonad"; displayManager.defaultSession = "none+xmonad";
libinput = { libinput = {
enable = true; enable = true;
touchpad = {disableWhileTyping = true;}; touchpad = { disableWhileTyping = true; };
}; };
}; };
upower.enable = true; upower.enable = true;
@ -35,6 +28,6 @@ with lib; {
pulse.enable = true; pulse.enable = true;
}; };
}; };
environment.systemPackages = with pkgs; [firefox thunderbird]; environment.systemPackages = with pkgs; [ firefox thunderbird ];
}; };
} }

16
secrets/shell.nix
View File

@ -1,15 +1,11 @@
{ { pkgs ? import <nixpkgs> { }, sops-nix ? pkgs.callPackage <sops-nix> { }
pkgs ? import <nixpkgs> {}, , name ? "secrets", ... }:
sops-nix ? pkgs.callPackage <sops-nix> {}, let
name ? "secrets",
...
}: let
sops-rekey = pkgs.writeShellScriptBin "sops-rekey" '' sops-rekey = pkgs.writeShellScriptBin "sops-rekey" ''
${pkgs.findutils}/bin/find . -wholename '*/secrets/*.yaml' -exec ${pkgs.sops}/bin/sops updatekeys {} \; ${pkgs.findutils}/bin/find . -wholename '*/secrets/*.yaml' -exec ${pkgs.sops}/bin/sops updatekeys {} \;
''; '';
in in pkgs.mkShell {
pkgs.mkShell { sopsPGPKeyDirs = [ ./keys/users ./keys/hosts ];
sopsPGPKeyDirs = [./keys/users ./keys/hosts];
name = name; name = name;
nativeBuildInputs = [ nativeBuildInputs = [
sops-nix.sops-import-keys-hook sops-nix.sops-import-keys-hook
@ -17,4 +13,4 @@ in
sops-rekey sops-rekey
pkgs.wireguard-tools pkgs.wireguard-tools
]; ];
} }

16
templates/base/flake.nix
View File

@ -2,7 +2,7 @@
description = "basic tool setup flake"; description = "basic tool setup flake";
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11";
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
flake-utils-plus.url = "github:gytis-ivaskevicius/flake-utils-plus"; flake-utils-plus.url = "github:gytis-ivaskevicius/flake-utils-plus";
@ -17,9 +17,14 @@
... ...
} @ inputs: } @ inputs:
{} {}
// (flake-utils.lib.eachDefaultSystem (system: let // (flake-utils.lib.eachDefaultSystem (
unstable = import nixpkgs-unstable {inherit system;}; system: let
pkgs = import nixpkgs {inherit system;}; unstable = import nixpkgs-unstable {
inherit system;
};
pkgs = import nixpkgs {
inherit system;
};
in rec { in rec {
devShell = pkgs.mkShell { devShell = pkgs.mkShell {
buildInputs = [ buildInputs = [
@ -27,5 +32,6 @@
# pkgs.clingo # pkgs.clingo
]; ];
}; };
})); }
));
} }

8
templates/rust/flake.nix
View File

@ -2,7 +2,7 @@
description = "basic rust flake"; description = "basic rust flake";
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11";
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
rust-overlay = { rust-overlay = {
url = "github:oxalica/rust-overlay"; url = "github:oxalica/rust-overlay";
@ -30,7 +30,8 @@
{ {
#overlay = import ./nix { inherit gitignoresrc; }; #overlay = import ./nix { inherit gitignoresrc; };
} }
// (flake-utils.lib.eachDefaultSystem (system: let // (flake-utils.lib.eachDefaultSystem (
system: let
unstable = import nixpkgs-unstable {inherit system;}; unstable = import nixpkgs-unstable {inherit system;};
pkgs = import nixpkgs { pkgs = import nixpkgs {
inherit system; inherit system;
@ -53,5 +54,6 @@
pkgs.kcov pkgs.kcov
]; ];
}; };
})); }
));
} }

5
users/ellmau/alacritty.nix
View File

@ -7,7 +7,10 @@
programs.alacritty = { programs.alacritty = {
enable = true; enable = true;
settings = { settings = {
window = {decorations = "none";}; window = {
decorations = "none";
};
alt_send_esc = true;
font = { font = {
normal.family = "Hasklug Nerd Font"; normal.family = "Hasklug Nerd Font";
size = 14; size = 14;

44
users/ellmau/autorandr.nix
View File

@ -1,23 +1,17 @@
{ { config, pkgs, lib, nixosConfig, ... }:
config,
pkgs,
lib,
nixosConfig,
...
}:
with lib; { with lib; {
config = let config = let cfg = nixosConfig.elss.graphical.xserver.autorandr;
cfg = nixosConfig.elss.graphical.xserver.autorandr; in mkIf cfg.enable {
in
mkIf cfg.enable {
#services.autorandr = { enable = true; }; #services.autorandr = { enable = true; };
programs.autorandr = { programs.autorandr = {
enable = true; enable = true;
profiles = { profiles = {
"home" = { "home" = {
fingerprint = { fingerprint = {
DP-1 = "00ffffffffffff0009d1507945540000221e0104b54627783f5995af4f42af260f5054a56b80d1c0b300a9c08180810081c0010101014dd000a0f0703e8030203500ba892100001a000000ff004e384c30323634373031390a20000000fd00283c87873c010a202020202020000000fc0042656e5120455733323730550a01bc02033af1515d5e5f6061101f222120051404131203012309070783010000e200c06d030c0020003878200060010203e305e001e6060501544c2ca36600a0f0701f8030203500ba892100001a565e00a0a0a029502f203500ba892100001abf650050a0402e6008200808ba892100001c000000000000000000000000000000bf"; DP-1 =
eDP-1 = "00ffffffffffff0006af2b2800000000001c0104a51d117802ee95a3544c99260f50540000000101010101010101010101010101010152d000a0f0703e803020350025a51000001a000000000000000000000000000000000000000000fe0039304e544880423133335a414e0000000000024103a8011100000b010a20200006"; "00ffffffffffff0009d1507945540000221e0104b54627783f5995af4f42af260f5054a56b80d1c0b300a9c08180810081c0010101014dd000a0f0703e8030203500ba892100001a000000ff004e384c30323634373031390a20000000fd00283c87873c010a202020202020000000fc0042656e5120455733323730550a01bc02033af1515d5e5f6061101f222120051404131203012309070783010000e200c06d030c0020003878200060010203e305e001e6060501544c2ca36600a0f0701f8030203500ba892100001a565e00a0a0a029502f203500ba892100001abf650050a0402e6008200808ba892100001c000000000000000000000000000000bf";
eDP-1 =
"00ffffffffffff0006af2b2800000000001c0104a51d117802ee95a3544c99260f50540000000101010101010101010101010101010152d000a0f0703e803020350025a51000001a000000000000000000000000000000000000000000fe0039304e544880423133335a414e0000000000024103a8011100000b010a20200006";
}; };
config = { config = {
eDP-1.enable = false; eDP-1.enable = false;
@ -32,7 +26,8 @@ with lib; {
}; };
}; };
"mobile" = { "mobile" = {
fingerprint.eDP-1 = "00ffffffffffff0006af2b2800000000001c0104a51d117802ee95a3544c99260f50540000000101010101010101010101010101010152d000a0f0703e803020350025a51000001a000000000000000000000000000000000000000000fe0039304e544880423133335a414e0000000000024103a8011100000b010a20200006"; fingerprint.eDP-1 =
"00ffffffffffff0006af2b2800000000001c0104a51d117802ee95a3544c99260f50540000000101010101010101010101010101010152d000a0f0703e803020350025a51000001a000000000000000000000000000000000000000000fe0039304e544880423133335a414e0000000000024103a8011100000b010a20200006";
config = { config = {
eDP-1 = { eDP-1 = {
enable = true; enable = true;
@ -44,8 +39,10 @@ with lib; {
}; };
"work" = { "work" = {
fingerprint = { fingerprint = {
eDP-1 = "00ffffffffffff0006af2b2800000000001c0104a51d117802ee95a3544c99260f50540000000101010101010101010101010101010152d000a0f0703e803020350025a51000001a000000000000000000000000000000000000000000fe0039304e544880423133335a414e0000000000024103a8011100000b010a20200006"; eDP-1 =
DP-2 = "00ffffffffffff0010acb5414c4133452c1e0104b53c22783eee95a3544c99260f5054a54b00e1c0d100d1c0b300a94081808100714f4dd000a0f0703e803020350055502100001a000000ff0031444e593132330a2020202020000000fd00184b1e8c36010a202020202020000000fc0044454c4c205532373230510a2001af020319f14c101f2005140413121103020123097f0783010000a36600a0f0703e803020350055502100001a565e00a0a0a029503020350055502100001a114400a0800025503020360055502100001a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000d9"; "00ffffffffffff0006af2b2800000000001c0104a51d117802ee95a3544c99260f50540000000101010101010101010101010101010152d000a0f0703e803020350025a51000001a000000000000000000000000000000000000000000fe0039304e544880423133335a414e0000000000024103a8011100000b010a20200006";
DP-2 =
"00ffffffffffff0010acb5414c4133452c1e0104b53c22783eee95a3544c99260f5054a54b00e1c0d100d1c0b300a94081808100714f4dd000a0f0703e803020350055502100001a000000ff0031444e593132330a2020202020000000fd00184b1e8c36010a202020202020000000fc0044454c4c205532373230510a2001af020319f14c101f2005140413121103020123097f0783010000a36600a0f0703e803020350055502100001a565e00a0a0a029503020350055502100001a114400a0800025503020360055502100001a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000d9";
}; };
config = { config = {
eDP-1 = { eDP-1 = {
@ -68,7 +65,8 @@ with lib; {
}; };
"home-nuc" = { "home-nuc" = {
fingerprint = { fingerprint = {
DP-2 = "00ffffffffffff0009d1507945540000221e0104b54627783f5995af4f42af260f5054a56b80d1c0b300a9c08180810081c0010101014dd000a0f0703e8030203500ba892100001a000000ff004e384c30323634373031390a20000000fd00283c87873c010a202020202020000000fc0042656e5120455733323730550a01bc02033af1515d5e5f6061101f222120051404131203012309070783010000e200c06d030c0020003878200060010203e305e001e6060501544c2ca36600a0f0701f8030203500ba892100001a565e00a0a0a029502f203500ba892100001abf650050a0402e6008200808ba892100001c000000000000000000000000000000bf"; DP-2 =
"00ffffffffffff0009d1507945540000221e0104b54627783f5995af4f42af260f5054a56b80d1c0b300a9c08180810081c0010101014dd000a0f0703e8030203500ba892100001a000000ff004e384c30323634373031390a20000000fd00283c87873c010a202020202020000000fc0042656e5120455733323730550a01bc02033af1515d5e5f6061101f222120051404131203012309070783010000e200c06d030c0020003878200060010203e305e001e6060501544c2ca36600a0f0701f8030203500ba892100001a565e00a0a0a029502f203500ba892100001abf650050a0402e6008200808ba892100001c000000000000000000000000000000bf";
}; };
config = { config = {
DP-2 = { DP-2 = {
@ -84,8 +82,10 @@ with lib; {
"e3027" = { "e3027" = {
fingerprint = { fingerprint = {
e-DP1 = "00ffffffffffff0006af2b2800000000001c0104a51d117802ee95a3544c99260f50540000000101010101010101010101010101010152d000a0f0703e803020350025a51000001a000000000000000000000000000000000000000000fe0039304e544880423133335a414e0000000000024103a8011100000b010a20200006"; e-DP1 =
DP-1 = "00ffffffffffff004ca306a7010101011715010380a05a780ade50a3544c99260f5054a10800814081c0950081809040b300a9400101283c80a070b023403020360040846300001a9e20009051201f304880360040846300001c000000fd0017550f5c11000a202020202020000000fc004550534f4e20504a0a202020200116020328f651901f202205140413030212110706161501230907078301000066030c00100080e200fd023a801871382d40582c450040846300001e011d801871382d40582c450040846300001e662156aa51001e30468f330040846300001e302a40c8608464301850130040846300001e00000000000000000000000000000089"; "00ffffffffffff0006af2b2800000000001c0104a51d117802ee95a3544c99260f50540000000101010101010101010101010101010152d000a0f0703e803020350025a51000001a000000000000000000000000000000000000000000fe0039304e544880423133335a414e0000000000024103a8011100000b010a20200006";
DP-1 =
"00ffffffffffff004ca306a7010101011715010380a05a780ade50a3544c99260f5054a10800814081c0950081809040b300a9400101283c80a070b023403020360040846300001a9e20009051201f304880360040846300001c000000fd0017550f5c11000a202020202020000000fc004550534f4e20504a0a202020200116020328f651901f202205140413030212110706161501230907078301000066030c00100080e200fd023a801871382d40582c450040846300001e011d801871382d40582c450040846300001e662156aa51001e30468f330040846300001e302a40c8608464301850130040846300001e00000000000000000000000000000089";
}; };
config = { config = {
eDP-1 = { eDP-1 = {
@ -105,8 +105,10 @@ with lib; {
"e3027-clone" = { "e3027-clone" = {
fingerprint = { fingerprint = {
e-DP1 = "00ffffffffffff0006af2b2800000000001c0104a51d117802ee95a3544c99260f50540000000101010101010101010101010101010152d000a0f0703e803020350025a51000001a000000000000000000000000000000000000000000fe0039304e544880423133335a414e0000000000024103a8011100000b010a20200006"; e-DP1 =
DP-1 = "00ffffffffffff004ca306a7010101011715010380a05a780ade50a3544c99260f5054a10800814081c0950081809040b300a9400101283c80a070b023403020360040846300001a9e20009051201f304880360040846300001c000000fd0017550f5c11000a202020202020000000fc004550534f4e20504a0a202020200116020328f651901f202205140413030212110706161501230907078301000066030c00100080e200fd023a801871382d40582c450040846300001e011d801871382d40582c450040846300001e662156aa51001e30468f330040846300001e302a40c8608464301850130040846300001e00000000000000000000000000000089"; "00ffffffffffff0006af2b2800000000001c0104a51d117802ee95a3544c99260f50540000000101010101010101010101010101010152d000a0f0703e803020350025a51000001a000000000000000000000000000000000000000000fe0039304e544880423133335a414e0000000000024103a8011100000b010a20200006";
DP-1 =
"00ffffffffffff004ca306a7010101011715010380a05a780ade50a3544c99260f5054a10800814081c0950081809040b300a9400101283c80a070b023403020360040846300001a9e20009051201f304880360040846300001c000000fd0017550f5c11000a202020202020000000fc004550534f4e20504a0a202020200116020328f651901f202205140413030212110706161501230907078301000066030c00100080e200fd023a801871382d40582c450040846300001e011d801871382d40582c450040846300001e662156aa51001e30468f330040846300001e302a40c8608464301850130040846300001e00000000000000000000000000000089";
}; };
config = { config = {
eDP-1 = { eDP-1 = {

14
users/ellmau/dunst.nix
View File

@ -1,15 +1,7 @@
{ { config, pkgs, lib, nixosConfig, ... }:
config,
pkgs,
lib,
nixosConfig,
...
}:
with lib; { with lib; {
config = let config = let cfg = nixosConfig.elss.users.dunst;
cfg = nixosConfig.elss.users.dunst; in mkIf cfg.enable {
in
mkIf cfg.enable {
services.dunst = { services.dunst = {
iconTheme = { iconTheme = {
package = pkgs.numix-icon-theme; package = pkgs.numix-icon-theme;

24
users/ellmau/polybar_xmonad.nix
View File

@ -1,15 +1,7 @@
{ { config, pkgs, lib, nixosConfig, ... }:
config,
pkgs,
lib,
nixosConfig,
...
}:
with lib; { with lib; {
config = let config = let cfg = nixosConfig.elss.graphical.xmonad.polybar;
cfg = nixosConfig.elss.graphical.xmonad.polybar; in mkIf cfg.enable {
in
mkIf cfg.enable {
services.polybar = { services.polybar = {
enable = true; enable = true;
package = pkgs.polybarFull; package = pkgs.polybarFull;
@ -67,9 +59,11 @@ with lib; {
"module/dunst" = { "module/dunst" = {
type = "custom/script"; type = "custom/script";
exec = "PATH=${pkgs.dbus}/bin/:$PATH ${pkgs.dunst}/bin/dunstctl is-paused | ${pkgs.gnugrep}/bin/grep -q true && echo || echo "; exec =
"PATH=${pkgs.dbus}/bin/:$PATH ${pkgs.dunst}/bin/dunstctl is-paused | ${pkgs.gnugrep}/bin/grep -q true && echo || echo ";
interval = 10; interval = 10;
click-left = "PATH=${pkgs.dbus}/bin/:$PATH ${pkgs.dunst}/bin/dunstctl set-paused toggle"; click-left =
"PATH=${pkgs.dbus}/bin/:$PATH ${pkgs.dunst}/bin/dunstctl set-paused toggle";
}; };
"module/volume" = { "module/volume" = {
@ -77,7 +71,7 @@ with lib; {
format.volume = "<ramp-volume> <label-volume>"; format.volume = "<ramp-volume> <label-volume>";
label.muted.text = "🔇"; label.muted.text = "🔇";
label.muted.foreground = "#666"; label.muted.foreground = "#666";
ramp.volume = ["🔈" "🔉" "🔊"]; ramp.volume = [ "🔈" "🔉" "🔊" ];
click.right = "${pkgs.pavucontrol}/bin/pavucontrol &"; click.right = "${pkgs.pavucontrol}/bin/pavucontrol &";
# format-volume-underline = Base2; # format-volume-underline = Base2;
# format-muted-underline = Base2; # format-muted-underline = Base2;
@ -132,7 +126,7 @@ with lib; {
}; };
systemd.user.services.polybar = { systemd.user.services.polybar = {
Install.WantedBy = ["graphical-session.target"]; Install.WantedBy = [ "graphical-session.target" ];
}; };
}; };
} }

17
users/ellmau/xmonad.nix
View File

@ -1,15 +1,7 @@
{ { config, pkgs, lib, nixosConfig, ... }:
config,
pkgs,
lib,
nixosConfig,
...
}:
with lib; { with lib; {
config = let config = let cfg = nixosConfig.elss.graphical.xmonad;
cfg = nixosConfig.elss.graphical.xmonad; in mkIf cfg.enable {
in
mkIf cfg.enable {
xsession = { xsession = {
windowManager.xmonad = { windowManager.xmonad = {
enable = true; enable = true;
@ -26,6 +18,7 @@ with lib; {
''; '';
config = conf/xmonad/xmonad.hs; config = conf/xmonad/xmonad.hs;
}; };
}; };
services = { services = {
@ -41,6 +34,6 @@ with lib; {
gtk.enable = true; gtk.enable = true;
home.packages = with pkgs; [rofi polybarFull firefox pulseaudioFull]; home.packages = with pkgs; [ rofi polybarFull firefox pulseaudioFull ];
}; };
} }