diff --git a/flake.lock b/flake.lock index f5a62d5..7b961a9 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1675811720, - "narHash": "sha256-WXWChFo1DAUK+/YkeLwzZQDsH43y7c1JWozRuVNQYg8=", + "lastModified": 1675888750, + "narHash": "sha256-w3T9UiRN6SaKMYI62+Ic3ka1Tyr9zaBcclhh3e4RCUk=", "owner": "nix-community", "repo": "home-manager", - "rev": "6d95d98b6b4876c9ab589327331196b2893581c5", + "rev": "1232d0e13305f462a5a7c29584f50eb232cc4ba0", "type": "github" }, "original": { @@ -29,11 +29,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1675689419, - "narHash": "sha256-UyCVZVhkZiisMPjfDTAzQIe0YpIkN1Gic97bie3Kf0A=", + "lastModified": 1675896866, + "narHash": "sha256-jsLMiTuOlTwkXM7RK4zyNo6Z7VnAE0qer13imaGEIxQ=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "863812a0979646fbc1a51b6593fa25fbad77a7be", + "rev": "859d6b9b8a961669c814632bbc7a1a9d94556551", "type": "github" }, "original": { @@ -81,11 +81,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1675673983, - "narHash": "sha256-8hzNh1jtiPxL5r3ICNzSmpSzV7kGb3KwX+FS5BWJUTo=", + "lastModified": 1675763311, + "narHash": "sha256-bz0Q2H3mxsF1CUfk26Sl9Uzi8/HFjGFD/moZHz1HebU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5a350a8f31bb7ef0c6e79aea3795a890cf7743d4", + "rev": "fab09085df1b60d6a0870c8a89ce26d5a4a708c2", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 92b38ae..05926ac 100644 --- a/flake.nix +++ b/flake.nix @@ -41,9 +41,9 @@ ./hosts/local/frija/default.nix ./hosts/local/frija/hardware-configuration.nix ./hosts/local/frija/packages.nix - ./users/aspire/home-manager.nix # User Specific + ./users/aspire/home-manager.nix #./users/aspire/syncthing.nix home-manager.nixosModules.home-manager @@ -58,7 +58,34 @@ tyr = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; 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.useGlobalPkgs = true; @@ -71,7 +98,33 @@ tuisto = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; 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.useGlobalPkgs = true; @@ -95,7 +148,7 @@ ./common/flakeinit.nix ./common/flatpak.nix ./common/gaming.nix - ./common/hyperland.nix + #./common/hyperland.nix ./common/insecure.nix ./common/networking.nix ./common/unfree.nix @@ -106,10 +159,10 @@ ./hosts/local/weda/default.nix ./hosts/local/weda/hardware-configuration.nix ./hosts/local/weda/packages.nix - ./users/weda/home-manager.nix # User Specific - #./users/aspire/syncthing.nix + ./users/zonsopkomst/home-manager.nix + ./users/zonsopkomst/syncthing.nix home-manager.nixosModules.home-manager { diff --git a/hosts/local/tyr/configuration.nix b/hosts/local/tyr/default.nix similarity index 75% rename from hosts/local/tyr/configuration.nix rename to hosts/local/tyr/default.nix index 9a3ef5f..b619310 100644 --- a/hosts/local/tyr/configuration.nix +++ b/hosts/local/tyr/default.nix @@ -6,20 +6,8 @@ { 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. @@ -44,46 +32,46 @@ # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; # Enable networking - networking.networkmanager.enable = true; + ##networking.networkmanager.enable = true; # Set your time zone. - time.timeZone = "America/Chicago"; + ##time.timeZone = "America/Chicago"; # Select internationalisation properties. - i18n.defaultLocale = "en_US.utf8"; + ##i18n.defaultLocale = "en_US.utf8"; # Enable the X11 windowing system. - services.xserver.enable = true; + ##services.xserver.enable = true; # Enable the KDE Plasma Desktop Environment. services.xserver.displayManager.sddm.enable = true; services.xserver.desktopManager.plasma5.enable = true; # Configure keymap in X11 - services.xserver = { - layout = "us"; - xkbVariant = ""; - }; + ##services.xserver = { + ##layout = "us"; + ##xkbVariant = ""; + ##}; # Enable CUPS to print documents. - services.printing.enable = true; + ##services.printing.enable = true; # Enable sound with pipewire. - sound.enable = true; - hardware.pulseaudio.enable = false; - security.rtkit.enable = true; - services.pipewire = { - enable = true; - alsa.enable = true; - alsa.support32Bit = true; - pulse.enable = true; + ##sound.enable = true; + ##hardware.pulseaudio.enable = false; + ##security.rtkit.enable = true; + ## + ##enable = true; + ##alsa.enable = true; + ##alsa.support32Bit = true; + ##pulse.enable = true; # If you want to use JACK applications, uncomment this #jack.enable = true; # 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) #media-session.enable = true; - }; + ##}; # Enable touchpad support (enabled default in most desktopManager). # services.xserver.libinput.enable = true; @@ -103,13 +91,12 @@ services.xserver.displayManager.autoLogin.user = "leeuwarden"; # Allow unfree packages - nixpkgs.config.allowUnfree = true; + ##nixpkgs.config.allowUnfree = true; # List packages installed in system profile. To search, run: # $ nix search wget 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 diff --git a/hosts/local/tyr/home-manager.nix b/hosts/local/tyr/home-manager.nix.delete similarity index 100% rename from hosts/local/tyr/home-manager.nix rename to hosts/local/tyr/home-manager.nix.delete diff --git a/hosts/local/weda/default.nix b/hosts/local/weda/default.nix index 4c20467..1ecf023 100644 --- a/hosts/local/weda/default.nix +++ b/hosts/local/weda/default.nix @@ -91,7 +91,7 @@ # 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) #media-session.enable = true; - }; + #}; # Enable touchpad support (enabled default in most desktopManager). # services.xserver.libinput.enable = true; diff --git a/hosts/local/weda/home-manager.nix b/hosts/local/weda/home-manager.nix.delete similarity index 100% rename from hosts/local/weda/home-manager.nix rename to hosts/local/weda/home-manager.nix.delete diff --git a/hosts/remote/tuisto/configuration.nix b/hosts/remote/tuisto/default.nix similarity index 70% rename from hosts/remote/tuisto/configuration.nix rename to hosts/remote/tuisto/default.nix index 3d54e31..3548904 100644 --- a/hosts/remote/tuisto/configuration.nix +++ b/hosts/remote/tuisto/default.nix @@ -6,19 +6,7 @@ { 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. @@ -34,59 +22,59 @@ # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; # Enable networking - networking.networkmanager.enable = true; + ##networking.networkmanager.enable = true; # Set your time zone. - time.timeZone = "America/Chicago"; + ##time.timeZone = "America/Chicago"; # Select internationalisation properties. - i18n.defaultLocale = "en_US.UTF-8"; + ##i18n.defaultLocale = "en_US.UTF-8"; - i18n.extraLocaleSettings = { - LC_ADDRESS = "en_US.UTF-8"; - LC_IDENTIFICATION = "en_US.UTF-8"; - LC_MEASUREMENT = "en_US.UTF-8"; - LC_MONETARY = "en_US.UTF-8"; - LC_NAME = "en_US.UTF-8"; - LC_NUMERIC = "en_US.UTF-8"; - LC_PAPER = "en_US.UTF-8"; - LC_TELEPHONE = "en_US.UTF-8"; - LC_TIME = "en_US.UTF-8"; - }; + ##i18n.extraLocaleSettings = { + ##LC_ADDRESS = "en_US.UTF-8"; + ##LC_IDENTIFICATION = "en_US.UTF-8"; + ##LC_MEASUREMENT = "en_US.UTF-8"; + ##LC_MONETARY = "en_US.UTF-8"; + ##LC_NAME = "en_US.UTF-8"; + ##LC_NUMERIC = "en_US.UTF-8"; + ##LC_PAPER = "en_US.UTF-8"; + ##LC_TELEPHONE = "en_US.UTF-8"; + ##LC_TIME = "en_US.UTF-8"; + ##}; # Enable the X11 windowing system. - services.xserver.enable = true; + ##services.xserver.enable = true; # Enable the GNOME Desktop Environment. - services.xserver.displayManager.gdm.enable = true; - services.xserver.desktopManager.gnome.enable = true; + ##services.xserver.displayManager.gdm.enable = true; + ##services.xserver.desktopManager.gnome.enable = true; # Configure keymap in X11 - services.xserver = { - layout = "us"; - xkbVariant = ""; - }; + ##services.xserver = { + ##layout = "us"; + ##xkbVariant = ""; + ##}; # Enable CUPS to print documents. - services.printing.enable = true; - services.printing.drivers = [ pkgs.hplip ]; + ##services.printing.enable = true; + ##services.printing.drivers = [ pkgs.hplip ]; # Enable sound with pipewire. - sound.enable = true; - hardware.pulseaudio.enable = false; - security.rtkit.enable = true; - services.pipewire = { - enable = true; - alsa.enable = true; - alsa.support32Bit = true; - pulse.enable = true; + ##sound.enable = true; + ##hardware.pulseaudio.enable = false; + ##security.rtkit.enable = true; + ##services.pipewire = { + ##enable = true; + ##alsa.enable = true; + ##alsa.support32Bit = true; + ##pulse.enable = true; # If you want to use JACK applications, uncomment this #jack.enable = true; # 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) #media-session.enable = true; - }; + ##}; # Enable touchpad support (enabled default in most desktopManager). # services.xserver.libinput.enable = true; diff --git a/users/aspire/home-manager.nix b/users/aspire/home-manager.nix index 9fff62e..fa51f96 100644 --- a/users/aspire/home-manager.nix +++ b/users/aspire/home-manager.nix @@ -1,26 +1,31 @@ { 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 "" in "Imports" section above home-manager.users.aspire = { pkgs, ... }: { home.packages = with pkgs; [ - # Begin packages and options - alacritty - # Moved btop from hosts/local/frija/packages.nix to test, if successful, move other packages - btop + alacritty + btop ]; - # Need to enable home.stateVersion for it to work correctly: + home.stateVersion = "22.11"; - # Begin configuration or script declarations + home.file = { + # Alacritty ".config/alacritty/alacritty.yml".text = '' {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; }; }; } \ No newline at end of file diff --git a/users/leeuwarden/home-manager.nix b/users/leeuwarden/home-manager.nix index 8670cf2..42402e3 100644 --- a/users/leeuwarden/home-manager.nix +++ b/users/leeuwarden/home-manager.nix @@ -17,11 +17,22 @@ home.stateVersion = "22.05"; # Begin configuration or script declarations home.file = { + # Alacritty ".config/alacritty/alacritty.yml".text = '' {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; }; }; } \ No newline at end of file diff --git a/users/wagner/home-manager.nix b/users/wagner/home-manager.nix index 856cf91..4efcb27 100644 --- a/users/wagner/home-manager.nix +++ b/users/wagner/home-manager.nix @@ -1,30 +1,32 @@ { 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 "" in "Imports" section above home-manager.users.wagner = { pkgs, ... }: { home.packages = with pkgs; [ - # Begin packages and options - alacritty - kitty + + alacritty + kitty ]; - # Need to enable home.stateVersion for it to work correctly: + home.stateVersion = "22.11"; - # Begin configuration or script declarations + home.file = { + # Alacritty ".config/alacritty/alacritty.yml".text = '' {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 - #".config/hypr/hyprland.conf".source = ../../config/hyprland.conf; + # Dunst + ".config/dunst/dunstrc".source = ../../config/dunstrc; + + # Kitty + ".config/kitty/kitty.conf".source = ../../config/kitty.conf; + + # Waybar + ".config/waybar/config".source = ../../config/waybar/config; }; }; diff --git a/users/zonsopkomst/home-manager.nix b/users/zonsopkomst/home-manager.nix index db79033..dd2f257 100644 --- a/users/zonsopkomst/home-manager.nix +++ b/users/zonsopkomst/home-manager.nix @@ -3,42 +3,40 @@ { home-manager.users.zonsopkomst = { pkgs, ... }: { home.packages = with pkgs; [ - # Begin packages and options - alacritty - cmatrix - dconf2nix - dunst - #eww - hyprpaper - kitty - ranger - slurp # screenshot - speedcrunch - waybar - wofi - pdfarranger - + alacritty + cmatrix + dconf2nix + dunst + #eww + hyprpaper + kitty + ranger + slurp # screenshot + speedcrunch + waybar + wofi + pdfarranger ]; - # Need to enable home.stateVersion for it to work correctly: + home.stateVersion = "22.11"; - # Begin configuration or script declarations + home.file = { # Alacritty ".config/alacritty/alacritty.yml".text = '' {window: {opacity: 0.8}, font: {normal: {family: tamsyn, style: Regular}}} ''; + # Bash + ".bashrc".source = ../../config/.bashrc; + # Dunst ".config/dunst/dunstrc".source = ../../config/dunstrc; - ".bashrc".source = ../../config/.bashrc; # Kitty ".config/kitty/kitty.conf".source = ../../config/kitty.conf; - ".bashrc".source = ../../config/.bashrc; # Waybar - ".config/waybar/config".source = ../../waybar/config/config; - ".bashrc".source = ../../config/.bashrc; + ".config/waybar/config".source = ../../config/waybar/config; }; }; } \ No newline at end of file