diff --git a/configurations/nixos/pureintent/default.nix b/configurations/nixos/pureintent/default.nix index 53c7947..339a9f4 100644 --- a/configurations/nixos/pureintent/default.nix +++ b/configurations/nixos/pureintent/default.nix @@ -28,10 +28,6 @@ in services.openssh.enable = true; services.tailscale.enable = true; - services.netdata = { - enable = true; - package = pkgs.netdataCloud; - }; services.nginx = { enable = true; virtualHosts."pureintent" = diff --git a/configurations/nixos/vixen-old/configuration.nix b/configurations/nixos/vixen-old/configuration.nix new file mode 100644 index 0000000..d2674ba --- /dev/null +++ b/configurations/nixos/vixen-old/configuration.nix @@ -0,0 +1,65 @@ +{ pkgs, ... }: + +{ + imports = + [ + # Include the results of the hardware scan. + ./hardware-configuration.nix + ]; + + # Bootloader. + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + + networking.hostName = "vixen"; # Define your hostname. + # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. + + # Enable networking + networking.networkmanager.enable = true; + + # Select internationalisation properties. + 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"; + }; + + # Configure keymap in X11 + services.xserver.xkb = { + layout = "us"; + variant = ""; + }; + + # Enable CUPS to print documents. + services.printing.enable = true; + + # Enable sound with pipewire. + security.rtkit.enable = true; + services.pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + }; + + # Enable touchpad support (enabled default in most desktopManager). + # services.xserver.libinput.enable = true; + + + # This value determines the NixOS release from which the default + # settings for stateful data, like file locations and database versions + # on your system were taken. It‘s perfectly fine and recommended to leave + # 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? + +} diff --git a/configurations/nixos/vixen-old/default.nix b/configurations/nixos/vixen-old/default.nix new file mode 100644 index 0000000..c8167e1 --- /dev/null +++ b/configurations/nixos/vixen-old/default.nix @@ -0,0 +1,43 @@ +{ flake, pkgs, ... }: + +let + inherit (flake) inputs; + inherit (inputs) self; +in +{ + imports = [ + self.nixosModules.default + inputs.nixos-hardware.nixosModules.lenovo-thinkpad-p14s-amd-gen4 + ./configuration.nix + (self + /modules/nixos/linux/distributed-build.nix) + # (self + /modules/nixos/linux/gui/hyprland) + (self + /modules/nixos/linux/gui/gnome.nix) + (self + /modules/nixos/linux/gui/desktopish/fonts.nix) + (self + /modules/nixos/linux/gui/_1password.nix) + (self + /modules/nixos/linux/gui/desktopish/monitor-brightness.nix) + ]; + + # Use latest kernel + boot.kernelPackages = pkgs.linuxPackages_latest; + + services.openssh.enable = true; + services.tailscale.enable = true; + # services.fprintd.enable = true; -- bad UX + + programs.nix-ld.enable = true; # for vscode server + programs.steam.enable = true; + + environment.systemPackages = with pkgs; [ + firefox + epiphany + google-chrome + vscode + telegram-desktop + vlc + aria2 + ]; + + # Workaround the annoying `Failed to start Network Manager Wait Online` error on switch. + # https://github.com/NixOS/nixpkgs/issues/180175 + systemd.services.NetworkManager-wait-online.enable = false; +} diff --git a/configurations/nixos/vixen-old/hardware-configuration.nix b/configurations/nixos/vixen-old/hardware-configuration.nix new file mode 100644 index 0000000..4336335 --- /dev/null +++ b/configurations/nixos/vixen-old/hardware-configuration.nix @@ -0,0 +1,45 @@ +# Do not modify this file! It was generated by ‘nixos-generate-config’ +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. +{ config, lib, pkgs, modulesPath, ... }: + +{ + imports = + [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usbhid" "usb_storage" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-amd" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { + device = "/dev/disk/by-uuid/d9360bc5-d8d1-4b0d-b365-9e753fa03531"; + fsType = "ext4"; + }; + + boot.initrd.luks.devices."luks-1cf2cb06-3425-45d1-8a94-faf62abd3017".device = "/dev/disk/by-uuid/1cf2cb06-3425-45d1-8a94-faf62abd3017"; + + fileSystems."/boot" = + { + device = "/dev/disk/by-uuid/665D-E58F"; + fsType = "vfat"; + options = [ "fmask=0077" "dmask=0077" ]; + }; + + 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 + # still possible to use this option, but it's recommended to use it in conjunction + # with explicit per-interface declarations with `networking.interfaces..useDHCP`. + networking.useDHCP = lib.mkDefault true; + # networking.interfaces.enp102s0u1u3c2.useDHCP = lib.mkDefault true; + # networking.interfaces.enp1s0f0.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp2s0.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/configurations/nixos/vixen/home-media.nix b/configurations/nixos/vixen-old/home-media.nix similarity index 100% rename from configurations/nixos/vixen/home-media.nix rename to configurations/nixos/vixen-old/home-media.nix diff --git a/configurations/nixos/vixen/configuration.nix b/configurations/nixos/vixen/configuration.nix index d2674ba..2c43234 100644 --- a/configurations/nixos/vixen/configuration.nix +++ b/configurations/nixos/vixen/configuration.nix @@ -1,4 +1,8 @@ -{ pkgs, ... }: +# Edit this configuration file to define what should be installed on +# your system. Help is available in the configuration.nix(5) man page +# and in the NixOS manual (accessible by running ‘nixos-help’). + +{ config, pkgs, ... }: { imports = @@ -14,9 +18,16 @@ networking.hostName = "vixen"; # Define your hostname. # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. + # Configure network proxy if necessary + # networking.proxy.default = "http://user:password@proxy:port/"; + # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; + # Enable networking networking.networkmanager.enable = true; + # Set your time zone. + time.timeZone = "America/New_York"; + # Select internationalisation properties. i18n.defaultLocale = "en_US.UTF-8"; @@ -32,6 +43,13 @@ LC_TIME = "en_US.UTF-8"; }; + # Enable the X11 windowing system. + services.xserver.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 = { layout = "us"; @@ -42,17 +60,65 @@ services.printing.enable = true; # Enable sound with pipewire. + 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; + # Define a user account. Don't forget to set a password with ‘passwd’. + users.users.srid = { + isNormalUser = true; + description = "srid"; + extraGroups = [ "networkmanager" "wheel" ]; + packages = with pkgs; [ + # thunderbird + ]; + }; + + # Install firefox. + programs.firefox.enable = true; + + # Allow unfree packages + 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 + # started in user sessions. + # programs.mtr.enable = true; + # programs.gnupg.agent = { + # enable = true; + # enableSSHSupport = true; + # }; + + # List services that you want to enable: + + # Enable the OpenSSH daemon. + # services.openssh.enable = true; + + # Open ports in the firewall. + # networking.firewall.allowedTCPPorts = [ ... ]; + # networking.firewall.allowedUDPPorts = [ ... ]; + # Or disable the firewall altogether. + # networking.firewall.enable = false; # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions @@ -60,6 +126,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 = "24.11"; # Did you read the comment? } diff --git a/configurations/nixos/vixen/default.nix b/configurations/nixos/vixen/default.nix index 740bb50..58bd70f 100644 --- a/configurations/nixos/vixen/default.nix +++ b/configurations/nixos/vixen/default.nix @@ -8,36 +8,19 @@ in imports = [ self.nixosModules.default inputs.nixos-hardware.nixosModules.lenovo-thinkpad-p14s-amd-gen4 - ./configuration.nix - (self + /modules/nixos/linux/distributed-build.nix) - (self + /modules/nixos/linux/gui/hyprland) - (self + /modules/nixos/linux/gui/gnome.nix) - (self + /modules/nixos/linux/gui/desktopish/fonts.nix) (self + /modules/nixos/linux/gui/_1password.nix) + (self + /modules/nixos/linux/gui/steam.nix) (self + /modules/nixos/linux/gui/desktopish/monitor-brightness.nix) + + ./configuration.nix ]; - # Use latest kernel - boot.kernelPackages = pkgs.linuxPackages_latest; - - services.openssh.enable = true; + boot.initrd.kernelModules = [ "amdgpu" ]; + services.xserver.videoDrivers = [ "amdgpu" ]; services.tailscale.enable = true; - # services.fprintd.enable = true; -- bad UX - - programs.nix-ld.enable = true; # for vscode server - programs.steam.enable = true; - environment.systemPackages = with pkgs; [ - firefox - epiphany google-chrome - vscode - telegram-desktop - vlc - aria2 + zed-editor + calibre ]; - - # Workaround the annoying `Failed to start Network Manager Wait Online` error on switch. - # https://github.com/NixOS/nixpkgs/issues/180175 - systemd.services.NetworkManager-wait-online.enable = false; } diff --git a/configurations/nixos/vixen/hardware-configuration.nix b/configurations/nixos/vixen/hardware-configuration.nix index 4336335..25811ae 100644 --- a/configurations/nixos/vixen/hardware-configuration.nix +++ b/configurations/nixos/vixen/hardware-configuration.nix @@ -16,15 +16,13 @@ fileSystems."/" = { - device = "/dev/disk/by-uuid/d9360bc5-d8d1-4b0d-b365-9e753fa03531"; + device = "/dev/disk/by-uuid/3741a848-da2c-4d57-8087-54a3134d19b8"; fsType = "ext4"; }; - boot.initrd.luks.devices."luks-1cf2cb06-3425-45d1-8a94-faf62abd3017".device = "/dev/disk/by-uuid/1cf2cb06-3425-45d1-8a94-faf62abd3017"; - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/665D-E58F"; + device = "/dev/disk/by-uuid/E1A4-419A"; fsType = "vfat"; options = [ "fmask=0077" "dmask=0077" ]; }; @@ -36,7 +34,6 @@ # still possible to use this option, but it's recommended to use it in conjunction # with explicit per-interface declarations with `networking.interfaces..useDHCP`. networking.useDHCP = lib.mkDefault true; - # networking.interfaces.enp102s0u1u3c2.useDHCP = lib.mkDefault true; # networking.interfaces.enp1s0f0.useDHCP = lib.mkDefault true; # networking.interfaces.wlp2s0.useDHCP = lib.mkDefault true; diff --git a/flake.lock b/flake.lock index 4a7d2ab..c0af2ac 100644 --- a/flake.lock +++ b/flake.lock @@ -423,15 +423,16 @@ ] }, "locked": { - "lastModified": 1742588233, - "narHash": "sha256-Fi5g8H5FXMSRqy+mU6gPG0v+C9pzjYbkkiePtz8+PpA=", + "lastModified": 1742655702, + "narHash": "sha256-jbqlw4sPArFtNtA1s3kLg7/A4fzP4GLk9bGbtUJg0JQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "296ddc64627f4a6a4eb447852d7346b9dd16197d", + "rev": "0948aeedc296f964140d9429223c7e4a0702a1ff", "type": "github" }, "original": { "owner": "nix-community", + "ref": "release-24.11", "repo": "home-manager", "type": "github" } @@ -709,15 +710,16 @@ ] }, "locked": { - "lastModified": 1742595055, - "narHash": "sha256-cEetDber6LF8W4ThmRc4rwKs/o8y2GH0pUdX7e6CnAQ=", + "lastModified": 1743127615, + "narHash": "sha256-+sMGqywrSr50BGMLMeY789mSrzjkoxZiu61eWjYS/8o=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "e9f41de2a81f04390afd106959adf352a207628f", + "rev": "fc843893cecc1838a59713ee3e50e9e7edc6207c", "type": "github" }, "original": { "owner": "LnL7", + "ref": "nix-darwin-24.11", "repo": "nix-darwin", "type": "github" } @@ -827,11 +829,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1729624485, - "narHash": "sha256-iEffyT68tEU5kHQuyP05QRH+JhWNNLAwHfgZAzXFS7o=", + "lastModified": 1743167577, + "narHash": "sha256-I09SrXIO0UdyBFfh0fxDq5WnCDg8XKmZ1HQbaXzMA1k=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "22e8de2729f40d29a445c8baeaf22740b8b25daf", + "rev": "0ed819e708af17bfc4bbc63ee080ef308a24aa42", "type": "github" }, "original": { @@ -949,16 +951,16 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1742422364, - "narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=", + "lastModified": 1742937945, + "narHash": "sha256-lWc+79eZRyvHp/SqMhHTMzZVhpxkRvthsP1Qx6UCq0E=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc", + "rev": "d02d88f8de5b882ccdde0465d8fa2db3aa1169f7", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index db27f17..2ec40a3 100644 --- a/flake.nix +++ b/flake.nix @@ -3,11 +3,11 @@ inputs = { # Principle inputs - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; flake-parts.url = "github:hercules-ci/flake-parts"; - nix-darwin.url = "github:LnL7/nix-darwin"; + nix-darwin.url = "github:LnL7/nix-darwin/nix-darwin-24.11"; nix-darwin.inputs.nixpkgs.follows = "nixpkgs"; - home-manager.url = "github:nix-community/home-manager"; + home-manager.url = "github:nix-community/home-manager/release-24.11"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; nixos-hardware.url = "github:NixOS/nixos-hardware"; nixos-unified.url = "github:srid/nixos-unified"; diff --git a/modules/nixos/linux/gui/desktopish/fonts.nix b/modules/nixos/linux/gui/desktopish/fonts.nix index bebbd94..ae1cc5d 100644 --- a/modules/nixos/linux/gui/desktopish/fonts.nix +++ b/modules/nixos/linux/gui/desktopish/fonts.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ pkgs, ... }: { fonts = { @@ -10,9 +10,6 @@ # If this happens , keep noto-fonts-emoji and try disabling others (nerdfonts, etc.) noto-fonts-emoji fira-code - cascadia-code - nerd-fonts._0xproto - nerd-fonts.droid-sans-mono font-awesome ]; }; diff --git a/modules/nixos/linux/gui/steam.nix b/modules/nixos/linux/gui/steam.nix new file mode 100644 index 0000000..5be894f --- /dev/null +++ b/modules/nixos/linux/gui/steam.nix @@ -0,0 +1,10 @@ +{ + + programs.steam = { + enable = true; + remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play + dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server + localNetworkGameTransfers.openFirewall = true; # Open ports in the firewall for Steam Local Network Game Transfers + }; + +}