diff --git a/nixos_24.11_cinnamon/config/default.nix b/nixos_24.11_cinnamon/config/default.nix index bee35d8..89faad9 100644 --- a/nixos_24.11_cinnamon/config/default.nix +++ b/nixos_24.11_cinnamon/config/default.nix @@ -11,6 +11,7 @@ ./fonts.nix ./gpu-amd.nix #./gpu-intel.nix + ./home.nix #./kvm.nix #./laptop.nix #./mpd.nix diff --git a/nixos_24.11_cinnamon/home.nix b/nixos_24.11_cinnamon/config/home.nix similarity index 72% rename from nixos_24.11_cinnamon/home.nix rename to nixos_24.11_cinnamon/config/home.nix index 26ed3c7..53eac57 100644 --- a/nixos_24.11_cinnamon/home.nix +++ b/nixos_24.11_cinnamon/config/home.nix @@ -1,20 +1,30 @@ { config, lib, pkgs, osConfig, ... }: + let + hostName = "wlin001-nixos"; + userName = "zulumann"; + userDir = "/home/zulumann"; + userEmail = "zulumann_70@gmx.de"; + stateVersion = "24.11"; + home-manager = builtins.fetchTarball "https://github.com/nix-community/home-manager/archive/release-24.11.tar.gz"; in + { imports = [ (import "${home-manager}/nixos") ]; - home-manager.backupFileExtension = "backup"; - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; + home-manager = { + backupFileExtension = "backup"; + useGlobalPkgs = true; + useUserPackages = true; + }; - home-manager.users.zulumann = { - home.stateVersion = "24.11"; - home.homeDirectory = "/home/zulumann"; + home-manager.users.${userName} = { + home.stateVersion = "${stateVersion}"; + home.homeDirectory = "${userDir}"; home.packages = with pkgs; [ neofetch ]; @@ -62,11 +72,10 @@ in # Enable GIT programs.git = { enable = true; - userName = "zulumann"; - userEmail = "zulumann_70@gmx.de"; + userName = "${userName}"; + userEmail = "${userEmail}"; }; - programs.home-manager.enable = true; }; diff --git a/nixos_24.11_cinnamon/config/home/playbooks/apt-dist.yml b/nixos_24.11_cinnamon/config/home/playbooks/apt-dist.yml deleted file mode 120000 index e547586..0000000 --- a/nixos_24.11_cinnamon/config/home/playbooks/apt-dist.yml +++ /dev/null @@ -1 +0,0 @@ -/nix/store/jhbyl0y5l3hi2g7qblmidk37cpg9agnn-home-manager-files/Ansible/playbooks/apt-dist.yml \ No newline at end of file diff --git a/nixos_24.11_cinnamon/config/home/wallpaper/5120x2880.jpg b/nixos_24.11_cinnamon/config/home/wallpaper/5120x2880.jpg deleted file mode 100644 index 5201b05..0000000 Binary files a/nixos_24.11_cinnamon/config/home/wallpaper/5120x2880.jpg and /dev/null differ diff --git a/nixos_24.11_cinnamon/config/home/wallpaper/Coasto 3.jpg b/nixos_24.11_cinnamon/config/home/wallpaper/Coasto 3.jpg deleted file mode 100644 index afead77..0000000 Binary files a/nixos_24.11_cinnamon/config/home/wallpaper/Coasto 3.jpg and /dev/null differ diff --git a/nixos_24.11_cinnamon/config/home/wallpaper/DarkCyan.png b/nixos_24.11_cinnamon/config/home/wallpaper/DarkCyan.png deleted file mode 100644 index d30202d..0000000 Binary files a/nixos_24.11_cinnamon/config/home/wallpaper/DarkCyan.png and /dev/null differ diff --git a/nixos_24.11_cinnamon/config/home/wallpaper/Mountain_04.jpg b/nixos_24.11_cinnamon/config/home/wallpaper/Mountain_04.jpg deleted file mode 100644 index 4c4224a..0000000 Binary files a/nixos_24.11_cinnamon/config/home/wallpaper/Mountain_04.jpg and /dev/null differ diff --git a/nixos_24.11_cinnamon/config/home/wallpaper/Textur_01.jpg b/nixos_24.11_cinnamon/config/home/wallpaper/Textur_01.jpg deleted file mode 100644 index 6ff4c33..0000000 Binary files a/nixos_24.11_cinnamon/config/home/wallpaper/Textur_01.jpg and /dev/null differ diff --git a/nixos_24.11_cinnamon/config/home/wallpaper/adapta_backgrounds01.jpg b/nixos_24.11_cinnamon/config/home/wallpaper/adapta_backgrounds01.jpg deleted file mode 100644 index e1a5907..0000000 Binary files a/nixos_24.11_cinnamon/config/home/wallpaper/adapta_backgrounds01.jpg and /dev/null differ diff --git a/nixos_24.11_cinnamon/config/home/wallpaper/adapta_backgrounds03.jpg b/nixos_24.11_cinnamon/config/home/wallpaper/adapta_backgrounds03.jpg deleted file mode 100644 index 0548530..0000000 Binary files a/nixos_24.11_cinnamon/config/home/wallpaper/adapta_backgrounds03.jpg and /dev/null differ diff --git a/nixos_24.11_cinnamon/config/home/wallpaper/adapta_backgrounds04.jpg b/nixos_24.11_cinnamon/config/home/wallpaper/adapta_backgrounds04.jpg deleted file mode 100644 index a993e56..0000000 Binary files a/nixos_24.11_cinnamon/config/home/wallpaper/adapta_backgrounds04.jpg and /dev/null differ diff --git a/nixos_24.11_cinnamon/config/home/wallpaper/cubes_1080.jpg b/nixos_24.11_cinnamon/config/home/wallpaper/cubes_1080.jpg deleted file mode 100644 index b65aff1..0000000 Binary files a/nixos_24.11_cinnamon/config/home/wallpaper/cubes_1080.jpg and /dev/null differ diff --git a/nixos_24.11_cinnamon/config/home/wallpaper/greenish.jpg b/nixos_24.11_cinnamon/config/home/wallpaper/greenish.jpg deleted file mode 100644 index b47e924..0000000 Binary files a/nixos_24.11_cinnamon/config/home/wallpaper/greenish.jpg and /dev/null differ diff --git a/nixos_24.11_cinnamon/configuration.nix b/nixos_24.11_cinnamon/configuration.nix index 33a2666..4b9a403 100644 --- a/nixos_24.11_cinnamon/configuration.nix +++ b/nixos_24.11_cinnamon/configuration.nix @@ -1,4 +1,13 @@ -{ config, pkgs, ... }: +{ config, lib, pkgs, ... }: + +let + hostName = "wlin001-nixos"; + userName = "zulumann"; + userDescription = "Henrik Lutzmann"; + userDir = "/home/zulumann"; + userEmail = "zulumann_70@gmx.de"; + stateVersion = "24.11"; +in { imports = [ @@ -23,6 +32,7 @@ kernelPackages = pkgs.linuxPackages_latest; #kernelPackages = pkgs.linuxKernel.kernels.linux_xanmod; # initrd.network.openvpn.enable = true; + initrd.systemd.enable = true; }; # Enable Kernel same-page merging @@ -33,7 +43,7 @@ networkmanager.enable = true; networkmanager.plugins = with pkgs; [ networkmanager-openvpn ]; usePredictableInterfaceNames = false; - hostName = "wlin001-nixos"; + hostName = "${hostName}"; }; # Set your time zone @@ -53,13 +63,20 @@ LC_TIME = "de_DE.UTF-8"; }; - # Configure console keymap - console.keyMap = "de"; + # Configure console + console = { + enable = true; + earlySetup = true; + font = "Lat2-Terminus16"; + packages = with pkgs; [terminus_font]; + keyMap = "de"; + #useXkbConfig = true; # use xkb.options in tty. + }; # Define a user account. Dont forget to set a password with passwd. - users.users.zulumann = { + users.users."${userName}" = { isNormalUser = true; - description = "Henrik Lutzmann"; + description = "${userDescription}"; extraGroups = [ "networkmanager" "wheel" "audio" "video" ]; openssh.authorizedKeys.keyFiles = [ /etc/nixos/config/home/ssh/authorized_keys ]; packages = with pkgs; [ ]; @@ -93,7 +110,7 @@ system.autoUpgrade = { enable = false; allowReboot = false; - channel = "https://channels.nixos.org/nixos-24.11"; + channel = "https://channels.nixos.org/nixos-${stateVersion}"; }; # NixOS Settings @@ -127,7 +144,7 @@ fileSystems."/".options = [ "noatime" "discard" ]; fileSystems."/home".options = [ "noatime" "discard" ]; - fileSystems."/home/zulumann/VM-Image" = { + fileSystems."${userDir}/VM-Image" = { device = "/dev/disk/by-uuid/3b47d34d-618a-4a33-9f65-cde6e0d6467e"; fsType = "ext4"; options = [ "discard" "noatime" "nofail" "x-systemd.device-timeout=3" ]; @@ -152,6 +169,12 @@ settings.PasswordAuthentication = false; }; + # Enable cron service + services.cron = { + enable = true; + systemCronJobs = [ "@hourly ${userName} ${userDir}/.rsync-backup.sh" ]; + }; + # Enable sound with pipewire hardware.pulseaudio.enable = false; security.rtkit.enable = true; @@ -182,13 +205,13 @@ # Open ports in the firewall # netstat -ntulp networking.firewall = { - enable = false; - allowPing = true; - logRefusedConnections = true; - allowedTCPPorts = [ ]; - allowedUDPPorts = [ ]; - allowedTCPPortRanges = [ ]; - allowedUDPPortRanges = [ ]; + enable = false; + allowPing = true; + logRefusedConnections = true; + allowedTCPPorts = [ ]; + allowedUDPPorts = [ ]; + allowedTCPPortRanges = [ ]; + allowedUDPPortRanges = [ ]; }; # Copy the NixOS configuration file and link it from the resulting system @@ -196,6 +219,6 @@ # accidentally delete configuration.nix. system.copySystemConfiguration = true; - system.stateVersion = "24.11"; + system.stateVersion = "${stateVersion}"; }