Zonsopkomst
/
flake
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cleanup

This commit is contained in:
Zonsopkomst 2023-02-08 23:38:12 -06:00
parent c069371f12
commit 1f5f55a61c
11 changed files with 187 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
flake.lock
View File

@ -8,11 +8,11 @@
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1675811720, "lastModified": 1675888750,
"narHash": "sha256-WXWChFo1DAUK+/YkeLwzZQDsH43y7c1JWozRuVNQYg8=", "narHash": "sha256-w3T9UiRN6SaKMYI62+Ic3ka1Tyr9zaBcclhh3e4RCUk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "6d95d98b6b4876c9ab589327331196b2893581c5", "rev": "1232d0e13305f462a5a7c29584f50eb232cc4ba0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -29,11 +29,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1675689419, "lastModified": 1675896866,
"narHash": "sha256-UyCVZVhkZiisMPjfDTAzQIe0YpIkN1Gic97bie3Kf0A=", "narHash": "sha256-jsLMiTuOlTwkXM7RK4zyNo6Z7VnAE0qer13imaGEIxQ=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "863812a0979646fbc1a51b6593fa25fbad77a7be", "rev": "859d6b9b8a961669c814632bbc7a1a9d94556551",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -81,11 +81,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1675673983, "lastModified": 1675763311,
"narHash": "sha256-8hzNh1jtiPxL5r3ICNzSmpSzV7kGb3KwX+FS5BWJUTo=", "narHash": "sha256-bz0Q2H3mxsF1CUfk26Sl9Uzi8/HFjGFD/moZHz1HebU=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5a350a8f31bb7ef0c6e79aea3795a890cf7743d4", "rev": "fab09085df1b60d6a0870c8a89ce26d5a4a708c2",
"type": "github" "type": "github"
}, },
"original": { "original": {

65
flake.nix
View File

@ -41,9 +41,9 @@
./hosts/local/frija/default.nix ./hosts/local/frija/default.nix
./hosts/local/frija/hardware-configuration.nix ./hosts/local/frija/hardware-configuration.nix
./hosts/local/frija/packages.nix ./hosts/local/frija/packages.nix
./users/aspire/home-manager.nix
# User Specific # User Specific
./users/aspire/home-manager.nix
#./users/aspire/syncthing.nix #./users/aspire/syncthing.nix
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
@ -58,7 +58,34 @@
tyr = nixpkgs.lib.nixosSystem { tyr = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
./hosts/local/tyr/configuration.nix
# Common Resources
#./common/amd.nix
./common/CUPS.nix
#./common/gnome.nix
./common/pipewire.nix
./common/time.nix
./common/docker.nix
./common/flakeinit.nix
./common/flatpak.nix
./common/gaming.nix
#./common/hyperland.nix
./common/insecure.nix
./common/networking.nix
./common/unfree.nix
#./common/waydroid.nix
./common/x11.nix
# Host Specific
./hosts/local/tyr/default.nix
./hosts/local/tyr/hardware-configuration.nix
./hosts/local/tyr/packages.nix
# User Specific
./users/leeuwarden/home-manager.nix
./users/leeuwarden/kdewallet.nix
./users/leeuwarden/syncthing.nix
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
{ {
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
@ -71,7 +98,33 @@
tuisto = nixpkgs.lib.nixosSystem { tuisto = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
./hosts/remote/tuisto/configuration.nix
# Common Resources
./common/amd.nix
./common/CUPS.nix
./common/gnome.nix
./common/pipewire.nix
./common/time.nix
./common/docker.nix
./common/flakeinit.nix
./common/flatpak.nix
./common/gaming.nix
#./common/hyperland.nix
./common/insecure.nix
./common/networking.nix
./common/unfree.nix
./common/waydroid.nix
./common/x11.nix
# Host Specific
./hosts/local/tuisto/default.nix
./hosts/local/tuisto/hardware-configuration.nix
./hosts/local/tuisto/packages.nix
./users/wagner/home-manager.nix
# User Specific
./users/wagner/syncthing.nix
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
{ {
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
@ -95,7 +148,7 @@
./common/flakeinit.nix ./common/flakeinit.nix
./common/flatpak.nix ./common/flatpak.nix
./common/gaming.nix ./common/gaming.nix
./common/hyperland.nix #./common/hyperland.nix
./common/insecure.nix ./common/insecure.nix
./common/networking.nix ./common/networking.nix
./common/unfree.nix ./common/unfree.nix
@ -106,10 +159,10 @@
./hosts/local/weda/default.nix ./hosts/local/weda/default.nix
./hosts/local/weda/hardware-configuration.nix ./hosts/local/weda/hardware-configuration.nix
./hosts/local/weda/packages.nix ./hosts/local/weda/packages.nix
./users/weda/home-manager.nix
# User Specific # User Specific
#./users/aspire/syncthing.nix ./users/zonsopkomst/home-manager.nix
./users/zonsopkomst/syncthing.nix
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
{ {

57
hosts/local/tyr/configuration.nix → hosts/local/tyr/default.nix
View File

@ -6,20 +6,8 @@
{ {
imports = imports =
[ # Include the results of the hardware scan. [
./hardware-configuration.nix
./packages.nix
#../../../common/amd.nix
../../../common/docker.nix
../../../common/flakeinit.nix
../../../common/flatpak.nix
../../../common/gaming.nix
#../../../common/hyprland.nix
../../../common/insecure.nix
../../../common/waydroid.nix
../../../users/leeuwarden/home-manager.nix
../../../users/leeuwarden/kdewallet.nix
../../../users/leeuwarden/syncthing.nix
]; ];
# Bootloader. # Bootloader.
@ -44,46 +32,46 @@
# networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
# Enable networking # Enable networking
networking.networkmanager.enable = true; ##networking.networkmanager.enable = true;
# Set your time zone. # Set your time zone.
time.timeZone = "America/Chicago"; ##time.timeZone = "America/Chicago";
# Select internationalisation properties. # Select internationalisation properties.
i18n.defaultLocale = "en_US.utf8"; ##i18n.defaultLocale = "en_US.utf8";
# Enable the X11 windowing system. # Enable the X11 windowing system.
services.xserver.enable = true; ##services.xserver.enable = true;
# Enable the KDE Plasma Desktop Environment. # Enable the KDE Plasma Desktop Environment.
services.xserver.displayManager.sddm.enable = true; services.xserver.displayManager.sddm.enable = true;
services.xserver.desktopManager.plasma5.enable = true; services.xserver.desktopManager.plasma5.enable = true;
# Configure keymap in X11 # Configure keymap in X11
services.xserver = { ##services.xserver = {
layout = "us"; ##layout = "us";
xkbVariant = ""; ##xkbVariant = "";
}; ##};
# Enable CUPS to print documents. # Enable CUPS to print documents.
services.printing.enable = true; ##services.printing.enable = true;
# Enable sound with pipewire. # Enable sound with pipewire.
sound.enable = true; ##sound.enable = true;
hardware.pulseaudio.enable = false; ##hardware.pulseaudio.enable = false;
security.rtkit.enable = true; ##security.rtkit.enable = true;
services.pipewire = { ##
enable = true; ##enable = true;
alsa.enable = true; ##alsa.enable = true;
alsa.support32Bit = true; ##alsa.support32Bit = true;
pulse.enable = true; ##pulse.enable = true;
# If you want to use JACK applications, uncomment this # If you want to use JACK applications, uncomment this
#jack.enable = true; #jack.enable = true;
# use the example session manager (no others are packaged yet so this is enabled by default, # use the example session manager (no others are packaged yet so this is enabled by default,
# 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;
}; ##};
# 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;
@ -103,13 +91,12 @@
services.xserver.displayManager.autoLogin.user = "leeuwarden"; services.xserver.displayManager.autoLogin.user = "leeuwarden";
# Allow unfree packages # Allow unfree packages
nixpkgs.config.allowUnfree = true; ##nixpkgs.config.allowUnfree = true;
# 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; [
# vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
# wget
]; ];
# Some programs need SUID wrappers, can be configured further or are # Some programs need SUID wrappers, can be configured further or are

0
hosts/local/tyr/home-manager.nix → hosts/local/tyr/home-manager.nix.delete
View File

2
hosts/local/weda/default.nix
View File

@ -91,7 +91,7 @@
# use the example session manager (no others are packaged yet so this is enabled by default, # use the example session manager (no others are packaged yet so this is enabled by default,
# 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;
}; #};
# 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;

0
hosts/local/weda/home-manager.nix → hosts/local/weda/home-manager.nix.delete
View File

78
hosts/remote/tuisto/configuration.nix → hosts/remote/tuisto/default.nix
View File

@ -6,19 +6,7 @@
{ {
imports = imports =
[ # Include the results of the hardware scan. [
./hardware-configuration.nix
./packages.nix
../../../common/amd.nix
../../../common/docker.nix
../../../common/flakeinit.nix
../../../common/flatpak.nix
../../../common/gaming.nix
#../../../common/hyperland.nix
../../../common/insecure.nix
#../../../common/waydroid.nix
../../../users/wagner/home-manager.nix
#../../../users/wagner/syncthing.nix
]; ];
# Bootloader. # Bootloader.
@ -34,59 +22,59 @@
# networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
# Enable networking # Enable networking
networking.networkmanager.enable = true; ##networking.networkmanager.enable = true;
# Set your time zone. # Set your time zone.
time.timeZone = "America/Chicago"; ##time.timeZone = "America/Chicago";
# Select internationalisation properties. # Select internationalisation properties.
i18n.defaultLocale = "en_US.UTF-8"; ##i18n.defaultLocale = "en_US.UTF-8";
i18n.extraLocaleSettings = { ##i18n.extraLocaleSettings = {
LC_ADDRESS = "en_US.UTF-8"; ##LC_ADDRESS = "en_US.UTF-8";
LC_IDENTIFICATION = "en_US.UTF-8"; ##LC_IDENTIFICATION = "en_US.UTF-8";
LC_MEASUREMENT = "en_US.UTF-8"; ##LC_MEASUREMENT = "en_US.UTF-8";
LC_MONETARY = "en_US.UTF-8"; ##LC_MONETARY = "en_US.UTF-8";
LC_NAME = "en_US.UTF-8"; ##LC_NAME = "en_US.UTF-8";
LC_NUMERIC = "en_US.UTF-8"; ##LC_NUMERIC = "en_US.UTF-8";
LC_PAPER = "en_US.UTF-8"; ##LC_PAPER = "en_US.UTF-8";
LC_TELEPHONE = "en_US.UTF-8"; ##LC_TELEPHONE = "en_US.UTF-8";
LC_TIME = "en_US.UTF-8"; ##LC_TIME = "en_US.UTF-8";
}; ##};
# Enable the X11 windowing system. # Enable the X11 windowing system.
services.xserver.enable = true; ##services.xserver.enable = true;
# Enable the GNOME Desktop Environment. # Enable the GNOME Desktop Environment.
services.xserver.displayManager.gdm.enable = true; ##services.xserver.displayManager.gdm.enable = true;
services.xserver.desktopManager.gnome.enable = true; ##services.xserver.desktopManager.gnome.enable = true;
# Configure keymap in X11 # Configure keymap in X11
services.xserver = { ##services.xserver = {
layout = "us"; ##layout = "us";
xkbVariant = ""; ##xkbVariant = "";
}; ##};
# Enable CUPS to print documents. # Enable CUPS to print documents.
services.printing.enable = true; ##services.printing.enable = true;
services.printing.drivers = [ pkgs.hplip ]; ##services.printing.drivers = [ pkgs.hplip ];
# Enable sound with pipewire. # Enable sound with pipewire.
sound.enable = true; ##sound.enable = true;
hardware.pulseaudio.enable = false; ##hardware.pulseaudio.enable = false;
security.rtkit.enable = true; ##security.rtkit.enable = true;
services.pipewire = { ##services.pipewire = {
enable = true; ##enable = true;
alsa.enable = true; ##alsa.enable = true;
alsa.support32Bit = true; ##alsa.support32Bit = true;
pulse.enable = true; ##pulse.enable = true;
# If you want to use JACK applications, uncomment this # If you want to use JACK applications, uncomment this
#jack.enable = true; #jack.enable = true;
# use the example session manager (no others are packaged yet so this is enabled by default, # use the example session manager (no others are packaged yet so this is enabled by default,
# 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;
}; ##};
# 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
users/aspire/home-manager.nix
View File

@ -1,26 +1,31 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
# Currently using to manage my config files on multiple systems
# See https://github.com/nix-community/home-manager for manual and configuration options
# 1) Remember to add unstable channel (in this case) in the terminal:
# sudo nix-channel --add https://github.com/nix-community/home-manager/archive/master.tar.gz home-manager
# 2) sudo nix-channel --update
# 3) Include "<home-manager/nixos>" in "Imports" section above
home-manager.users.aspire = { pkgs, ... }: { home-manager.users.aspire = { pkgs, ... }: {
home.packages = with pkgs; [ home.packages = with pkgs; [
# Begin packages and options alacritty
alacritty btop
# Moved btop from hosts/local/frija/packages.nix to test, if successful, move other packages
btop
]; ];
# Need to enable home.stateVersion for it to work correctly:
home.stateVersion = "22.11"; home.stateVersion = "22.11";
# Begin configuration or script declarations
home.file = { home.file = {
# Alacritty
".config/alacritty/alacritty.yml".text = '' ".config/alacritty/alacritty.yml".text = ''
{window: {opacity: 0.8}, font: {normal: {family: tamsyn, style: Regular}}} {window: {opacity: 0.8}, font: {normal: {family: tamsyn, style: Regular}}}
''; '';
# Bash
".bashrc".source = ../../config/.bashrc;
# Dunst
".config/dunst/dunstrc".source = ../../config/dunstrc;
# Kitty
".config/kitty/kitty.conf".source = ../../config/kitty.conf;
# Waybar
".config/waybar/config".source = ../../config/waybar/config;
}; };
}; };
} }

11
users/leeuwarden/home-manager.nix
View File

@ -17,11 +17,22 @@
home.stateVersion = "22.05"; home.stateVersion = "22.05";
# Begin configuration or script declarations # Begin configuration or script declarations
home.file = { home.file = {
# Alacritty
".config/alacritty/alacritty.yml".text = '' ".config/alacritty/alacritty.yml".text = ''
{window: {opacity: 0.8}, font: {normal: {family: tamsyn, style: Regular}}} {window: {opacity: 0.8}, font: {normal: {family: tamsyn, style: Regular}}}
''; '';
# Bash
".bashrc".source = ../../config/.bashrc;
# Dunst
".config/dunst/dunstrc".source = ../../config/dunstrc;
# Kitty
".config/kitty/kitty.conf".source = ../../config/kitty.conf; ".config/kitty/kitty.conf".source = ../../config/kitty.conf;
# Waybar
".config/waybar/config".source = ../../config/waybar/config;
}; };
}; };
} }

30
users/wagner/home-manager.nix
View File

@ -1,30 +1,32 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
# Currently using to manage my config files on multiple systems
# See https://github.com/nix-community/home -manager for manual and configuration options
# 1) Remember to add unstable channel (in this case) in the terminal:
# sudo nix-channel --add https://github.com/nix-community/home-manager/archive/master.tar.gz home-manager
# 2) sudo nix-channel --update
# 3) Include "<home-manager/nixos>" in "Imports" section above
home-manager.users.wagner = { pkgs, ... }: { home-manager.users.wagner = { pkgs, ... }: {
home.packages = with pkgs; [ home.packages = with pkgs; [
# Begin packages and options
alacritty alacritty
kitty kitty
]; ];
# Need to enable home.stateVersion for it to work correctly:
home.stateVersion = "22.11"; home.stateVersion = "22.11";
# Begin configuration or script declarations
home.file = { home.file = {
# Alacritty
".config/alacritty/alacritty.yml".text = '' ".config/alacritty/alacritty.yml".text = ''
{window: {opacity: 0.8}, font: {normal: {family: tamsyn, style: Regular}}} {window: {opacity: 0.8}, font: {normal: {family: tamsyn, style: Regular}}}
''; '';
".config/kitty/kitty.conf".source = ../../config/kitty.conf; # Bash
".bashrc".source = ../../config/.bashrc;
#TODO Uncomment the line below once you know that this will not overwrite your current hyprland.conf and that the location is correct # Dunst
#".config/hypr/hyprland.conf".source = ../../config/hyprland.conf; ".config/dunst/dunstrc".source = ../../config/dunstrc;
# Kitty
".config/kitty/kitty.conf".source = ../../config/kitty.conf;
# Waybar
".config/waybar/config".source = ../../config/waybar/config;
}; };
}; };

40
users/zonsopkomst/home-manager.nix
View File

@ -3,42 +3,40 @@
{ {
home-manager.users.zonsopkomst = { pkgs, ... }: { home-manager.users.zonsopkomst = { pkgs, ... }: {
home.packages = with pkgs; [ home.packages = with pkgs; [
# Begin packages and options alacritty
alacritty cmatrix
cmatrix dconf2nix
dconf2nix dunst
dunst #eww
#eww hyprpaper
hyprpaper kitty
kitty ranger
ranger slurp # screenshot
slurp # screenshot speedcrunch
speedcrunch waybar
waybar wofi
wofi pdfarranger
pdfarranger
]; ];
# Need to enable home.stateVersion for it to work correctly:
home.stateVersion = "22.11"; home.stateVersion = "22.11";
# Begin configuration or script declarations
home.file = { home.file = {
# Alacritty # Alacritty
".config/alacritty/alacritty.yml".text = '' ".config/alacritty/alacritty.yml".text = ''
{window: {opacity: 0.8}, font: {normal: {family: tamsyn, style: Regular}}} {window: {opacity: 0.8}, font: {normal: {family: tamsyn, style: Regular}}}
''; '';
# Bash
".bashrc".source = ../../config/.bashrc;
# Dunst # Dunst
".config/dunst/dunstrc".source = ../../config/dunstrc; ".config/dunst/dunstrc".source = ../../config/dunstrc;
".bashrc".source = ../../config/.bashrc;
# Kitty # Kitty
".config/kitty/kitty.conf".source = ../../config/kitty.conf; ".config/kitty/kitty.conf".source = ../../config/kitty.conf;
".bashrc".source = ../../config/.bashrc;
# Waybar # Waybar
".config/waybar/config".source = ../../waybar/config/config; ".config/waybar/config".source = ../../config/waybar/config;
".bashrc".source = ../../config/.bashrc;
}; };
}; };
} }