diff options
Diffstat (limited to 'hosts')
| -rw-r--r-- | hosts/ganymede/minecraft.nix (renamed from hosts/jupiter/minecraft.nix) | 0 | ||||
| -rw-r--r-- | hosts/ganymede/nixos.nix | 1 | ||||
| -rw-r--r-- | hosts/jupiter/config.nix | 1 | ||||
| -rw-r--r-- | hosts/jupiter/disks.nix | 54 | ||||
| -rw-r--r-- | hosts/jupiter/hjem.nix | 5 | ||||
| -rw-r--r-- | hosts/jupiter/nixos.nix | 15 | ||||
| -rw-r--r-- | hosts/jupiter/samba.nix | 66 |
7 files changed, 39 insertions, 103 deletions
diff --git a/hosts/jupiter/minecraft.nix b/hosts/ganymede/minecraft.nix index a42e9a0..a42e9a0 100644 --- a/hosts/jupiter/minecraft.nix +++ b/hosts/ganymede/minecraft.nix diff --git a/hosts/ganymede/nixos.nix b/hosts/ganymede/nixos.nix index af0716d..e4a72e9 100644 --- a/hosts/ganymede/nixos.nix +++ b/hosts/ganymede/nixos.nix @@ -7,4 +7,5 @@ ]; nixpkgs.hostPlatform = "x86_64-linux"; + system.stateVersion = "25.05"; } diff --git a/hosts/jupiter/config.nix b/hosts/jupiter/config.nix index 9747720..06f2005 100644 --- a/hosts/jupiter/config.nix +++ b/hosts/jupiter/config.nix @@ -6,7 +6,6 @@ desktop = { gnome.enable = true; - gdm.enable = true; programs = { diff --git a/hosts/jupiter/disks.nix b/hosts/jupiter/disks.nix index ebf76e4..a5b5fae 100644 --- a/hosts/jupiter/disks.nix +++ b/hosts/jupiter/disks.nix @@ -1,28 +1,34 @@ -{ - disko.enableConfig = true; - disko.devices = { - disk.main = { - device = "/dev/nvme0n1"; - type = "disk"; - content = { - type = "gpt"; - partitions = { - ESP = { - type = "EF00"; - size = "1G"; - content = { - type = "filesystem"; - format = "vfat"; - mountpoint = "/boot"; - mountOptions = ["umask=0077"]; +{inputs, ...}: { + imports = [ + inputs.disko.nixosModules.default + ]; + + disko = { + enableConfig = true; + devices = { + disk.main = { + device = "/dev/nvme0n1"; + type = "disk"; + content = { + type = "gpt"; + partitions = { + ESP = { + type = "EF00"; + size = "1G"; + content = { + type = "filesystem"; + format = "vfat"; + mountpoint = "/boot"; + mountOptions = ["umask=0077"]; + }; }; - }; - root = { - size = "100%"; - content = { - type = "filesystem"; - format = "ext4"; - mountpoint = "/"; + root = { + size = "100%"; + content = { + type = "filesystem"; + format = "ext4"; + mountpoint = "/"; + }; }; }; }; diff --git a/hosts/jupiter/hjem.nix b/hosts/jupiter/hjem.nix index 33d260a..3c85521 100644 --- a/hosts/jupiter/hjem.nix +++ b/hosts/jupiter/hjem.nix @@ -1,10 +1,15 @@ {pkgs, ...}: { packages = with pkgs; [ orca-slicer + bambu-studio + freecad-wayland gimp qbittorrent bottles + + vital musescore + helvum ]; } diff --git a/hosts/jupiter/nixos.nix b/hosts/jupiter/nixos.nix index f318195..5afeefe 100644 --- a/hosts/jupiter/nixos.nix +++ b/hosts/jupiter/nixos.nix @@ -4,25 +4,16 @@ ... }: { imports = [ - inputs.disko.nixosModules.disko ./disks.nix - - ./samba.nix - inputs.nixos-facter-modules.nixosModules.facter - {facter.reportPath = ./facter.json;} ]; - time.timeZone = "America/Chicago"; - systemd.network.wait-online.enable = false; # fix for weird wifi issue - # music stuff - environment.systemPackages = with pkgs; [vital helvum bambu-studio]; - fonts.packages = [pkgs.nerd-fonts.iosevka]; - system.stateVersion = "25.05"; - + facter.reportPath = ./facter.json; + time.timeZone = "America/Chicago"; nixpkgs.hostPlatform = "x86_64-linux"; + system.stateVersion = "25.05"; } diff --git a/hosts/jupiter/samba.nix b/hosts/jupiter/samba.nix deleted file mode 100644 index 8cf3429..0000000 --- a/hosts/jupiter/samba.nix +++ /dev/null @@ -1,66 +0,0 @@ -{config, ...}: { - users.users.${config.collinux.user.name}.extraGroups = ["brainusers"]; - users.users.bob = { - isNormalUser = true; - extraGroups = ["brainusers"]; - hashedPassword = "$y$j9T$L8CQv7V.LCD3gw/xR8M2T0$A4NHW9qpgc9pua7XE18P6ShICj.PNXHoyMW4yqmEMID"; - }; - - users.groups."brainusers".name = "brainusers"; - - # sudo smbpasswd -a collin <PASSWORD> - # sudo smbpasswd -n bob # no password - - networking.firewall.allowedTCPPorts = [445]; - services.samba = { - enable = true; - openFirewall = true; - settings = { - global = { - "workgroup" = "WORKGROUP"; - "server string" = "brain2.0"; - "security" = "user"; - "map to guest" = "Bad User"; - - # disable printing - "load printers" = "no"; - "printing" = "bsd"; - "printcap name" = "/dev/null"; - "disable spoolss" = "yes"; - }; - - "brain2.0-public" = { - path = "/srv/brain"; - "read only" = "yes"; - "guest ok" = "yes"; - "force group" = "brainusers"; - }; - - "brain2.0-admin" = { - path = "/srv/brain"; - "read only" = "no"; - "valid users" = "collin"; - writeable = "yes"; - browseable = "yes"; - "guest ok" = "no"; - "create mask" = "0660"; - "directory mask" = "0770"; - "force group" = "brainusers"; - }; - - "brain2.0-worldbuilding" = { - path = "/srv/brain/notes/worldbuilding"; - "read only" = "no"; - "guest ok" = "yes"; - writeable = "yes"; - browseable = "yes"; - public = "yes"; # make windows not ask for password? - "create mask" = "0660"; - "directory mask" = "0770"; - "force group" = "brainusers"; - - "delete readonly" = "no"; # prevent deletion of the directory - }; - }; - }; -} |