diff --git a/configurations/nixos/pureintent/configuration.nix b/configurations/nixos/pureintent/configuration.nix index 5d90d7b..f5deecd 100644 --- a/configurations/nixos/pureintent/configuration.nix +++ b/configurations/nixos/pureintent/configuration.nix @@ -15,6 +15,9 @@ boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; + # Use latest kernel. + boot.kernelPackages = pkgs.linuxPackages_latest; + networking.hostName = "pureintent"; # Define your hostname. # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. @@ -25,25 +28,14 @@ # Enable networking networking.networkmanager.enable = true; - # Set your time zone. - time.timeZone = "America/New_York"; - # Select internationalisation properties. - i18n.defaultLocale = "en_US.UTF-8"; + i18n.defaultLocale = "en_CA.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"; - }; + services.xserver.enable = true; - services.tailscale.enable = true; + # Enable the GNOME Desktop Environment. + services.xserver.displayManager.gdm.enable = true; + services.xserver.desktopManager.gnome.enable = true; # Configure keymap in X11 services.xserver.xkb = { @@ -51,19 +43,41 @@ variant = ""; }; + # Enable CUPS to print documents. + services.printing.enable = true; + + # Enable sound with pipewire. + services.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; # Define a user account. Don't forget to set a password with ‘passwd’. users.users.srid = { isNormalUser = true; - description = "srid"; + description = "Sridhar Ratnakumar"; extraGroups = [ "networkmanager" "wheel" ]; packages = with pkgs; [ # thunderbird ]; }; + # Install firefox. + programs.firefox.enable = true; + # Allow unfree packages nixpkgs.config.allowUnfree = true; @@ -72,6 +86,9 @@ 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 + neovim + git + btop ]; # Some programs need SUID wrappers, can be configured further or are @@ -88,7 +105,7 @@ services.openssh.enable = true; # Open ports in the firewall. - networking.firewall.allowedTCPPorts = [ 22 ]; + # networking.firewall.allowedTCPPorts = [ ... ]; # networking.firewall.allowedUDPPorts = [ ... ]; # Or disable the firewall altogether. # networking.firewall.enable = false; @@ -99,6 +116,6 @@ # this value at the release version of the first install of this system. # Before changing this value read the documentation for this option # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). - system.stateVersion = "24.05"; # Did you read the comment? + system.stateVersion = "25.05"; # Did you read the comment? } diff --git a/configurations/nixos/pureintent/default.nix b/configurations/nixos/pureintent/default.nix index b91ab44..5921fac 100644 --- a/configurations/nixos/pureintent/default.nix +++ b/configurations/nixos/pureintent/default.nix @@ -6,42 +6,18 @@ let in { nixos-unified.sshTarget = "srid@pureintent"; + # nixos-unified.sshTarget = "srid@192.168.2.244"; imports = [ self.nixosModules.default ./configuration.nix - (self + /modules/nixos/linux/eternal-terminal.nix) - (self + /modules/nixos/shared/github-runner.nix) - inputs.nix-serve-cloudflared.nixosModules.default ]; home-manager.sharedModules = [ - (self + /modules/home/all/dropbox.nix) - (self + /modules/home/all/vira.nix) + # (self + /modules/home/all/dropbox.nix) + # (self + /modules/home/all/vira.nix) ]; - # Cache key: cache.srid.ca:EGydqsWFaTZeW6vsXnOHclTXrmJ58gq/bkVYhRpuzQ8= - age.secrets."nix-serve-cloudflared/cache-key.pem" = { - file = self + /secrets/nix-serve-cloudflared/cache-key.pem.age; - mode = "0400"; - }; - - age.secrets."nix-serve-cloudflared/cloudflared-credentials.json" = { - file = self + /secrets/nix-serve-cloudflared/cloudflared-credentials.json.age; - mode = "0400"; - }; - - services.nix-serve-cloudflared = { - enable = true; - secretKeyFile = config.age.secrets."nix-serve-cloudflared/cache-key.pem".path; - cloudflare = { - tunnelId = "55569b77-5482-47c7-bf25-53d93b64d0c8"; - credentialsFile = config.age.secrets."nix-serve-cloudflared/cloudflared-credentials.json".path; - domain = "cache.srid.ca"; - }; - }; - - nix.settings.sandbox = "relaxed"; services.openssh.enable = true; diff --git a/configurations/nixos/pureintent/hardware-configuration.nix b/configurations/nixos/pureintent/hardware-configuration.nix index d526c1a..109165e 100644 --- a/configurations/nixos/pureintent/hardware-configuration.nix +++ b/configurations/nixos/pureintent/hardware-configuration.nix @@ -16,20 +16,20 @@ fileSystems."/" = { - device = "/dev/disk/by-uuid/5b8b55a8-6549-4eca-b770-f39d38be0c6c"; + device = "/dev/disk/by-uuid/7fc31294-d580-42c2-b23e-ddb46e4a2b39"; fsType = "ext4"; }; + boot.initrd.luks.devices."luks-dc6e2287-6e40-48c8-ba65-7f33194ae034".device = "/dev/disk/by-uuid/dc6e2287-6e40-48c8-ba65-7f33194ae034"; + fileSystems."/boot" = { - device = "/dev/disk/by-uuid/00EC-B10E"; + device = "/dev/disk/by-uuid/3045-7CCA"; fsType = "vfat"; options = [ "fmask=0077" "dmask=0077" ]; }; - swapDevices = [ - { device = "/var/lib/swapfile"; size = 32 * 1024; } - ]; + swapDevices = [ ]; # 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 @@ -37,7 +37,6 @@ # with explicit per-interface declarations with `networking.interfaces..useDHCP`. networking.useDHCP = lib.mkDefault true; # networking.interfaces.enp1s0.useDHCP = lib.mkDefault true; - # networking.interfaces.enp6s0u1u3c2.useDHCP = lib.mkDefault true; # networking.interfaces.wlp2s0.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; diff --git a/flake.lock b/flake.lock index 8a25acf..db90c6e 100644 --- a/flake.lock +++ b/flake.lock @@ -601,21 +601,6 @@ "type": "github" } }, - "nix-serve-cloudflared": { - "locked": { - "lastModified": 1759348821, - "narHash": "sha256-rpxRWlwx80advIOCo6I2cksQETmkIGhoCyC4hbpE7oc=", - "owner": "srid", - "repo": "nix-serve-cloudflared", - "rev": "b7c127d315c513e3d05160b834dc2f113e5cf5cd", - "type": "github" - }, - "original": { - "owner": "srid", - "repo": "nix-serve-cloudflared", - "type": "github" - } - }, "nix-systems": { "inputs": { "flake-parts": "flake-parts_5", @@ -958,7 +943,6 @@ "nix-darwin": "nix-darwin", "nix-doom-emacs-unstraightened": "nix-doom-emacs-unstraightened", "nix-index-database": "nix-index-database", - "nix-serve-cloudflared": "nix-serve-cloudflared", "nixos-hardware": "nixos-hardware", "nixos-unified": "nixos-unified", "nixos-vscode-server": "nixos-vscode-server", diff --git a/flake.nix b/flake.nix index 7692f28..a8543b3 100644 --- a/flake.nix +++ b/flake.nix @@ -28,7 +28,6 @@ nix-index-database.inputs.nixpkgs.follows = "nixpkgs"; try.url = "github:tobi/try"; vira.url = "github:juspay/vira"; - nix-serve-cloudflared.url = "github:srid/nix-serve-cloudflared"; nix-ai-tools.url = "github:numtide/nix-ai-tools"; nix-ai-tools.inputs.nixpkgs.follows = "nixpkgs"; landrun-nix.url = "github:srid/landrun-nix"; diff --git a/modules/home/all/vira.nix b/modules/home/all/vira.nix index df9f6b6..2795a00 100644 --- a/modules/home/all/vira.nix +++ b/modules/home/all/vira.nix @@ -35,7 +35,6 @@ in imako = "https://github.com/srid/imako.git"; emanote = "https://github.com/srid/emanote.git"; ny = "https://github.com/nammayatri/nammayatri.git"; - nix-serve-cloudflared = "https://github.com/srid/nix-serve-cloudflared.git"; vertex = "https://github.com/juspay/vertex.git"; landrun-nix = "https://github.com/srid/landrun-nix.git"; }; diff --git a/secrets/nix-serve-cloudflared/cache-key.pem.age b/secrets/nix-serve-cloudflared/cache-key.pem.age deleted file mode 100644 index f2be09b..0000000 --- a/secrets/nix-serve-cloudflared/cache-key.pem.age +++ /dev/null @@ -1,11 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 96IXNQ eOTGv7ZtSQllk+esZuxPRMcPb/ih/OPSUu1iWS+Stlc -2taEhnjDLY5LMoTfKpHvpd8Oi9DPEsrsRxR1wiGAxOQ --> ssh-ed25519 Ysxvmg uk3DygJEdt0f0BT3IaZWMV1Y7+HfIAnwRJrGzzHu7Rw -jOgpde4upZmucuWAFYfwcuwn2KZe7wR5egYSzxcKgqo --> ssh-ed25519 HQ+y9w u1SCNgeYWb4bzfP2YaQ4zAVjbLn4DjBmGtS1xMfEJiY -OuVkqVdmtV2QOjiSGaBQpH0q2GdvopvnCXeAX8T9dU8 --> ssh-ed25519 p0qplg OSQQqK71R7hqWjuX7CU0gCx4luSsThLRq9hYwBszdWw -aZMcw0KVsSJw+K8U6h24O7ayjZbGmY+HlvlEZuwrIbs ---- /pZ7brPYwugM8s4muiCLI0u/mPLNiXWRhiC2gXzhMQc -r (Qyc ;Z** ՝$!Տ-K&|<׌/ļwcR{ PoYG~'iNbCoe᜘R7(a_BBGFC-5_&؉t \ No newline at end of file diff --git a/secrets/nix-serve-cloudflared/cloudflared-credentials.json.age b/secrets/nix-serve-cloudflared/cloudflared-credentials.json.age deleted file mode 100644 index 7259093..0000000 --- a/secrets/nix-serve-cloudflared/cloudflared-credentials.json.age +++ /dev/null @@ -1,11 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 96IXNQ 7mc1bNt7+SlS80zWIcESS3BDDbGX/Nzcv/HmpiJXPzk -6BQtl69t0UcoaMZvYMydi5Ssn66DaRTbEYOE0zmnOS8 --> ssh-ed25519 Ysxvmg nv9ndyVO9helRdywQnW+INIFfkR1eT17kfLIy9+PHlM -7TGdyOl8Kac83H4L+6PgIOuYLJEwuoyDzN4aWjUhEqk --> ssh-ed25519 HQ+y9w g+FGOsvLMob1RaFOMdf8sWXwLwJenY9mUhGw0W6yYQg -Y2Iix4zOUGRnpRca3HAiex22tNAc2EGEFqODMrEVj2U --> ssh-ed25519 p0qplg +5abAIfm6WBmQh+uGJSKX/wjn+kJZ4/zC++kRodwOGw -HNLIOKPkelMnkkObjvALmYUxFiYBfmHmYm2eNNghPik ---- RU/y77v3sDBXEmPlc4AOzAtUaNClgqq/Bqo1gXsrS+U -s+F |UoTg772݈TxқyݯFu8Rp=$׮X@. WwK-Oy: pHz]hU$VjVפ1`ͬJeVzV~1(LK[F[V jzd_lFJ3&u!2$ήкy@}U0JNe|{WPn[O \ No newline at end of file diff --git a/secrets/secrets.nix b/secrets/secrets.nix index e9a61fa..720b3d4 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -14,6 +14,4 @@ in "pureintent-basic-auth.age".publicKeys = users ++ systems; "gmail-app-password.age".publicKeys = users ++ systems; "hackage-password.age".publicKeys = users ++ systems; - "nix-serve-cloudflared/cache-key.pem.age".publicKeys = users ++ systems; - "nix-serve-cloudflared/cloudflared-credentials.json.age".publicKeys = users ++ systems; }