jonas/.hive
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

foamat code

Browse Source
This commit is contained in:
Jonas Röger 2024-04-17 16:47:06 +02:00
parent 1c7a93963a
commit ebedd90923
Signed by: jonas
GPG Key ID: 4000EB35E1AE0F07
23 changed files with 231 additions and 194 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
flake.nix
View File

@ -20,8 +20,14 @@
}; };
}; };
outputs = { self, nixpkgs, nixpkgs-unstable, home-manager, plasma-manager, ... }@inputs : outputs = {
let self,
nixpkgs,
nixpkgs-unstable,
home-manager,
plasma-manager,
...
} @ inputs: let
system = "x86_64-linux"; system = "x86_64-linux";
overlay-unstable = final: prev: { overlay-unstable = final: prev: {
unstable = nixpkgs-unstable.legacyPackages.${prev.system}; unstable = nixpkgs-unstable.legacyPackages.${prev.system};
@ -34,13 +40,18 @@
inherit inputs; inherit inputs;
}; };
modules = [ modules = [
({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; }) ({
config,
pkgs,
...
}: {nixpkgs.overlays = [overlay-unstable];})
./hosts/comfy-station/configuration.nix ./hosts/comfy-station/configuration.nix
home-manager.nixosModules.home-manager { home-manager.nixosModules.home-manager
home-manager.extraSpecialArgs = { inherit inputs; }; {
home-manager.extraSpecialArgs = {inherit inputs;};
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.sharedModules = [ plasma-manager.homeManagerModules.plasma-manager ]; home-manager.sharedModules = [plasma-manager.homeManagerModules.plasma-manager];
home-manager.users.jonas = import ./home/jonas/home.nix; home-manager.users.jonas = import ./home/jonas/home.nix;
} }
]; ];
@ -52,11 +63,12 @@
}; };
modules = [ modules = [
./hosts/vm/configuration.nix ./hosts/vm/configuration.nix
home-manager.nixosModules.home-manager { home-manager.nixosModules.home-manager
home-manager.extraSpecialArgs = { inherit inputs; }; {
home-manager.extraSpecialArgs = {inherit inputs;};
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.sharedModules = [ plasma-manager.homeManagerModules.plasma-manager ]; home-manager.sharedModules = [plasma-manager.homeManagerModules.plasma-manager];
home-manager.users.jonas = import ./home/jonas/home.nix; home-manager.users.jonas = import ./home/jonas/home.nix;
} }
]; ];

30
home/jonas/firefox.nix
View File

@ -1,6 +1,8 @@
{ config, inputs, ... }:
{ {
config,
inputs,
...
}: {
programs.firefox = { programs.firefox = {
enable = true; enable = true;
@ -13,17 +15,25 @@
# Search # Search
search = { search = {
default = "DuckDuckGo"; default = "DuckDuckGo";
order = [ "DuckDuckGo" "Google" ]; order = ["DuckDuckGo" "Google"];
force = true; force = true;
engines = { engines = {
"Nix Packages" = { "Nix Packages" = {
urls = [{ urls = [
template = "https://search.nixos.org/packages"; {
params = [ template = "https://search.nixos.org/packages";
{ name = "type"; value = "packages"; } params = [
{ name = "query"; value = "{searchTerms}"; } {
]; name = "type";
}]; value = "packages";
}
{
name = "query";
value = "{searchTerms}";
}
];
}
];
}; };
}; };
}; };

6
home/jonas/home.nix
View File

@ -1,6 +1,8 @@
{ config, pkgs, ... }:
{ {
config,
pkgs,
...
}: {
imports = [ imports = [
./firefox.nix ./firefox.nix
./plasma.nix ./plasma.nix

73
home/jonas/plasma.nix
View File

@ -1,5 +1,8 @@
{ pkgs, lib, ... }:
{ {
pkgs,
lib,
...
}: {
home.file.".local/share/wallpaper" = { home.file.".local/share/wallpaper" = {
source = ./static/wallpaper; source = ./static/wallpaper;
recursive = true; recursive = true;
@ -78,50 +81,48 @@
} }
]; ];
# #
# Some mid-level settings: # Some mid-level settings:
# #
shortcuts = { shortcuts = {
ksmserver = { ksmserver = {
"Lock Session" = [ "Screensaver" "Meta+Ctrl+Alt+L" ]; "Lock Session" = ["Screensaver" "Meta+Ctrl+Alt+L"];
}; };
kwin = { kwin =
"Expose" = "Meta+,"; {
"Switch Window Down" = "Meta+J"; "Expose" = "Meta+,";
"Switch Window Left" = "Meta+H"; "Switch Window Down" = "Meta+J";
"Switch Window Right" = "Meta+L"; "Switch Window Left" = "Meta+H";
"Switch Window Up" = "Meta+K"; "Switch Window Right" = "Meta+L";
"Window Quick Tile Bottom" = "Meta+Shift+J"; "Switch Window Up" = "Meta+K";
"Window Quick Tile Left" = "Meta+Shift+H"; "Window Quick Tile Bottom" = "Meta+Shift+J";
"Window Quick Tile Right" = "Meta+Shift+L"; "Window Quick Tile Left" = "Meta+Shift+H";
"Window Quick Tile Top" = "Meta+Shift+K"; "Window Quick Tile Right" = "Meta+Shift+L";
"Kill Window" = "Meta+Alt+Q"; "Window Quick Tile Top" = "Meta+Shift+K";
"Window Close" = "Meta+Shift+Q"; "Kill Window" = "Meta+Alt+Q";
} // ( "Window Close" = "Meta+Shift+Q";
with lib; }
let // (
desktops = map toString (lists.range 1 8); with lib; let
in desktops = map toString (lists.range 1 8);
listToAttrs in
(map listToAttrs
(i: { (map
name = "Switch to Desktop ${i}"; (i: {
value = "Meta+${i}"; name = "Switch to Desktop ${i}";
}) value = "Meta+${i}";
desktops) })
// desktops)
listToAttrs (map // listToAttrs (map
(i: { (i: {
name = "Window to Desktop ${i}"; name = "Window to Desktop ${i}";
value = "Meta+Shift+${i}"; value = "Meta+Shift+${i}";
}) })
desktops) desktops)
); );
}; };
# #
# Some low-level settings: # Some low-level settings:
# #

4
home/jonas/yubikey.nix
View File

@ -1,6 +1,4 @@
{ config, ... }: {config, ...}: {
{
programs.gpg = { programs.gpg = {
enable = true; enable = true;
mutableKeys = false; mutableKeys = false;

47
hosts/comfy-station/configuration.nix
View File

@ -1,31 +1,32 @@
# Edit this configuration file to define what should be installed on # Edit this configuration file to define what should be installed on
# your system. Help is available in the configuration.nix(5) man page # your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running ‘nixos-help’). # and in the NixOS manual (accessible by running ‘nixos-help’).
{ config, pkgs, inputs, ... }:
{ {
imports = config,
[ # Include the results of the hardware scan. pkgs,
./hardware-configuration.nix inputs,
inputs.home-manager.nixosModules.home-manager ...
../../modules/hardware/bluetooth.nix }: {
../../modules/hardware/printing.nix imports = [
../../modules/hardware/sound.nix # Include the results of the hardware scan.
../../modules/hardware/yubikey.nix ./hardware-configuration.nix
../../modules/services/docker.nix inputs.home-manager.nixosModules.home-manager
../../modules/desktop/dm ../../modules/hardware/bluetooth.nix
../../modules/desktop/de ../../modules/hardware/printing.nix
../../modules/desktop/fonts ../../modules/hardware/sound.nix
../../modules/chat ../../modules/hardware/yubikey.nix
../../modules/multimedia ../../modules/services/docker.nix
]; ../../modules/desktop/dm
../../modules/desktop/de
../../modules/desktop/fonts
../../modules/chat
../../modules/multimedia
];
desktop.dm.name = "sddm"; desktop.dm.name = "sddm";
desktop.dm.autologin = "jonas"; desktop.dm.autologin = "jonas";
desktop.de.plasma.enable = true; desktop.de.plasma.enable = true;
nix.settings.experimental-features = ["nix-command" "flakes"];
nix.settings.experimental-features = [ "nix-command" "flakes" ];
# Enable touchpad support (enabled default in most desktopManager). # Enable touchpad support (enabled default in most desktopManager).
# services.xserver.libinput.enable = true; # services.xserver.libinput.enable = true;
@ -34,7 +35,7 @@
users.users.jonas = { users.users.jonas = {
isNormalUser = true; isNormalUser = true;
description = "Jonas"; description = "Jonas";
extraGroups = [ "networkmanager" "wheel" "docker"]; extraGroups = ["networkmanager" "wheel" "docker"];
}; };
users.defaultUserShell = pkgs.zsh; users.defaultUserShell = pkgs.zsh;
@ -46,6 +47,7 @@
# List packages installed in system profile. To search, run: # List packages installed in system profile. To search, run:
# $ nix search wget # $ nix search wget
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
alejandra
docker docker
git git
ranger ranger
@ -119,7 +121,4 @@
# touchpad # touchpad
services.xserver.libinput.touchpad.naturalScrolling = true; services.xserver.libinput.touchpad.naturalScrolling = true;
# steam
programs.steam.enable = true;
} }

44
hosts/comfy-station/hardware-configuration.nix
View File

@ -1,33 +1,37 @@
# Do not modify this file! It was generated by ‘nixos-generate-config’ # Do not modify this file! It was generated by ‘nixos-generate-config’
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }:
{ {
imports = config,
[ (modulesPath + "/installer/scan/not-detected.nix") lib,
]; pkgs,
modulesPath,
...
}: {
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "nvme" "ehci_pci" "xhci_pci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; boot.initrd.availableKernelModules = ["nvme" "ehci_pci" "xhci_pci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc"];
boot.initrd.kernelModules = [ "dm-snapshot" ]; boot.initrd.kernelModules = ["dm-snapshot"];
boot.kernelModules = [ "kvm-amd" ]; boot.kernelModules = ["kvm-amd"];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [];
boot.initrd.luks.devices."lvm-root".device = "/dev/disk/by-uuid/0b55681d-5c7b-4045-b895-d1eb7e306ffb"; boot.initrd.luks.devices."lvm-root".device = "/dev/disk/by-uuid/0b55681d-5c7b-4045-b895-d1eb7e306ffb";
fileSystems."/" = fileSystems."/" = {
{ device = "/dev/disk/by-uuid/88f53721-1c3f-43fd-8875-59e597aacb10"; device = "/dev/disk/by-uuid/88f53721-1c3f-43fd-8875-59e597aacb10";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/boot" = fileSystems."/boot" = {
{ device = "/dev/disk/by-uuid/583D-114B"; device = "/dev/disk/by-uuid/583D-114B";
fsType = "vfat"; fsType = "vfat";
}; };
swapDevices = swapDevices = [
[ { device = "/dev/disk/by-uuid/f81521e7-4c09-4e91-8914-3dcd9febdfff"; } {device = "/dev/disk/by-uuid/f81521e7-4c09-4e91-8914-3dcd9febdfff";}
]; ];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's # (the default) this is the recommended approach. When using systemd-networkd it's

34
hosts/vm/configuration.nix
View File

@ -1,27 +1,27 @@
# Edit this configuration file to define what should be installed on # Edit this configuration file to define what should be installed on
# your system. Help is available in the configuration.nix(5) man page # your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running ‘nixos-help’). # and in the NixOS manual (accessible by running ‘nixos-help’).
{ pkgs, inputs, ... }:
{ {
imports = pkgs,
[ # Include the results of the hardware scan. inputs,
./hardware-configuration.nix ...
inputs.home-manager.nixosModules.home-manager }: {
../../modules/hardware/bluetooth.nix imports = [
../../modules/hardware/printing.nix # Include the results of the hardware scan.
../../modules/hardware/sound.nix ./hardware-configuration.nix
../../modules/services/docker.nix inputs.home-manager.nixosModules.home-manager
../../modules/desktop/dm ../../modules/hardware/bluetooth.nix
../../modules/desktop/de ../../modules/hardware/printing.nix
]; ../../modules/hardware/sound.nix
../../modules/services/docker.nix
../../modules/desktop/dm
../../modules/desktop/de
];
desktop.dm.name = "sddm"; desktop.dm.name = "sddm";
desktop.dm.autologin = "jonas"; desktop.dm.autologin = "jonas";
desktop.de.plasma.enable = true; desktop.de.plasma.enable = true;
# Enable touchpad support (enabled default in most desktopManager). # Enable touchpad support (enabled default in most desktopManager).
# services.xserver.libinput.enable = true; # services.xserver.libinput.enable = true;
@ -29,8 +29,8 @@
users.users.jonas = { users.users.jonas = {
isNormalUser = true; isNormalUser = true;
description = "Jonas"; description = "Jonas";
extraGroups = [ "networkmanager" "wheel" "docker"]; extraGroups = ["networkmanager" "wheel" "docker"];
packages = with pkgs; [ ]; packages = with pkgs; [];
}; };
users.defaultUserShell = pkgs.zsh; users.defaultUserShell = pkgs.zsh;

36
hosts/vm/hardware-configuration.nix
View File

@ -1,27 +1,31 @@
# Do not modify this file! It was generated by ‘nixos-generate-config’ # Do not modify this file! It was generated by ‘nixos-generate-config’
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }:
{ {
imports = [ ]; config,
lib,
pkgs,
modulesPath,
...
}: {
imports = [];
boot.initrd.availableKernelModules = [ "ata_piix" "ohci_pci" "ehci_pci" "ahci" "sd_mod" "sr_mod" ]; boot.initrd.availableKernelModules = ["ata_piix" "ohci_pci" "ehci_pci" "ahci" "sd_mod" "sr_mod"];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [];
boot.kernelModules = [ ]; boot.kernelModules = [];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [];
fileSystems."/" = fileSystems."/" = {
{ device = "/dev/disk/by-uuid/a28cd2c0-67f3-4492-9cd9-996fdbe2b8ef"; device = "/dev/disk/by-uuid/a28cd2c0-67f3-4492-9cd9-996fdbe2b8ef";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/boot" = fileSystems."/boot" = {
{ device = "/dev/disk/by-uuid/0134-2DF5"; device = "/dev/disk/by-uuid/0134-2DF5";
fsType = "vfat"; fsType = "vfat";
}; };
swapDevices = [ ]; swapDevices = [];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's # (the default) this is the recommended approach. When using systemd-networkd it's

8
modules/chat/default.nix
View File

@ -1,8 +1,10 @@
{ config, pkgs, ... }:
{ {
config,
pkgs,
...
}: {
users.users."jonas".packages = with pkgs; [ users.users."jonas".packages = with pkgs; [
discord discord
zoom zoom
]; ];
} }

6
modules/desktop/de/default.nix
View File

@ -1,8 +1,6 @@
{ ... }: {...}: {
{
imports = [ imports = [
./hyprland.nix ./hyprland.nix
./plasma.nix ./plasma.nix
]; ];
} }

11
modules/desktop/de/hyprland.nix
View File

@ -1,9 +1,10 @@
{ lib, config, ... }:
let
cfg = config.desktop.de.hyprland;
in
{ {
lib,
config,
...
}: let
cfg = config.desktop.de.hyprland;
in {
options.desktop.de.hyprland = { options.desktop.de.hyprland = {
enable = lib.mkEnableOption "enable hyprland desktop environment"; enable = lib.mkEnableOption "enable hyprland desktop environment";
}; };

14
modules/desktop/de/plasma.nix
View File

@ -1,9 +1,11 @@
{ config, lib, pkgs, ... }:
let
cfg = config.desktop.de.plasma;
in
{ {
config,
lib,
pkgs,
...
}: let
cfg = config.desktop.de.plasma;
in {
options.desktop.de.plasma = { options.desktop.de.plasma = {
enable = lib.mkEnableOption "Enable Plasma desktop environment with sddm"; enable = lib.mkEnableOption "Enable Plasma desktop environment with sddm";
}; };
@ -18,4 +20,4 @@ in
libsForQt5.qtstyleplugin-kvantum libsForQt5.qtstyleplugin-kvantum
]; ];
}; };
} }

13
modules/desktop/dm/default.nix
View File

@ -1,9 +1,10 @@
{ config, lib, ... }:
let
cfg = config.desktop.dm;
in
{ {
config,
lib,
...
}: let
cfg = config.desktop.dm;
in {
options.desktop.dm = with lib; { options.desktop.dm = with lib; {
name = mkOption { name = mkOption {
type = types.nullOr (types.enum ["sddm" "gdm"]); type = types.nullOr (types.enum ["sddm" "gdm"]);
@ -34,7 +35,7 @@ in
xkbVariant = ""; xkbVariant = "";
xkbOptions = "caps:ctrl_modifier"; xkbOptions = "caps:ctrl_modifier";
}; };
services.xserver.displayManager.autoLogin.enable = (cfg.autologin != null); services.xserver.displayManager.autoLogin.enable = cfg.autologin != null;
services.xserver.displayManager.autoLogin.user = cfg.autologin; services.xserver.displayManager.autoLogin.user = cfg.autologin;
}; };
} }

12
modules/desktop/dm/gdm.nix
View File

@ -1,12 +1,14 @@
{ lib, config, ... }:
let
cfg = config.desktop.dm;
in
{ {
lib,
config,
...
}: let
cfg = config.desktop.dm;
in {
config = lib.mkIf (cfg.name == "gdm") { config = lib.mkIf (cfg.name == "gdm") {
services.xserver.displayManager.gdm = { services.xserver.displayManager.gdm = {
enable = true; enable = true;
wayland = cfg.wayland; wayland = cfg.wayland;
}; };
}; };
} }

13
modules/desktop/dm/sddm.nix
View File

@ -1,13 +1,14 @@
{ lib, config, ... }:
let
cfg = config.desktop.dm;
in
{ {
lib,
config,
...
}: let
cfg = config.desktop.dm;
in {
config = lib.mkIf (cfg.name == "sddm") { config = lib.mkIf (cfg.name == "sddm") {
services.xserver.displayManager.sddm = { services.xserver.displayManager.sddm = {
enable = true; enable = true;
wayland.enable = cfg.wayland; wayland.enable = cfg.wayland;
}; };
}; };
} }

7
modules/desktop/fonts/default.nix
View File

@ -1,6 +1,9 @@
{ config, pkgs, ... }:
{ {
config,
pkgs,
...
}: {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
fira-code fira-code
]; ];
} }

6
modules/hardware/bluetooth.nix
View File

@ -1,6 +1,4 @@
{ config, ... }: {config, ...}: {
{
# Enable Bluetooth # Enable Bluetooth
hardware.bluetooth.enable = true; hardware.bluetooth.enable = true;
} }

6
modules/hardware/printing.nix
View File

@ -1,6 +1,4 @@
{ config, ... }: {config, ...}: {
{
# Enable CUPS to print documents. # Enable CUPS to print documents.
services.printing.enable = true; services.printing.enable = true;
} }

6
modules/hardware/sound.nix
View File

@ -1,6 +1,4 @@
{ config, ... }: {config, ...}: {
{
# Enable sound with pipewire. # Enable sound with pipewire.
sound.enable = true; sound.enable = true;
hardware.pulseaudio.enable = false; hardware.pulseaudio.enable = false;
@ -17,4 +15,4 @@
# no need to redefine it in your config for now) # no need to redefine it in your config for now)
#media-session.enable = true; #media-session.enable = true;
}; };
} }

5
modules/hardware/yubikey.nix
View File

@ -1,5 +1,8 @@
{ config, pkgs, ... }:
{ {
config,
pkgs,
...
}: {
# Include udev rules for yubikey. # Include udev rules for yubikey.
services.udev.packages = with pkgs; [ services.udev.packages = with pkgs; [
yubikey-personalization yubikey-personalization

8
modules/multimedia/default.nix
View File

@ -1,9 +1,11 @@
{ config, pkgs, ... }:
{ {
config,
pkgs,
...
}: {
programs.steam.enable = true; programs.steam.enable = true;
users.users."jonas".packages = with pkgs; [ users.users."jonas".packages = with pkgs; [
lutris lutris
spotify spotify
]; ];
} }

6
modules/services/docker.nix
View File

@ -1,5 +1,3 @@
{ config, ... }: {config, ...}: {
{
virtualisation.docker.enable = true; virtualisation.docker.enable = true;
} }