From 2281bf2a7b8e1870df2a78d7cbb15dea5d0d59c1 Mon Sep 17 00:00:00 2001 From: doloro Date: Sun, 21 Sep 2025 15:19:50 +0100 Subject: [PATCH] meow meow meow (nix) --- .gitignore | 1 + nix/configuration.nix | 123 +++++++++++++++++++++++++++++++++ nix/flake.nix | 3 + nix/hardware-configuration.nix | 18 +++++ nix/home.nix | 24 ++----- nix/modules/neovim/home.nix | 6 +- nix/result | 1 - 7 files changed, 156 insertions(+), 20 deletions(-) create mode 100644 .gitignore create mode 100644 nix/configuration.nix create mode 100644 nix/hardware-configuration.nix delete mode 120000 nix/result diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..7c54810 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +nix/result diff --git a/nix/configuration.nix b/nix/configuration.nix new file mode 100644 index 0000000..0f18584 --- /dev/null +++ b/nix/configuration.nix @@ -0,0 +1,123 @@ +# Edit this configuration file to define what should be installed on +# your system. Help is available in the configuration.nix(5) man page, on +# https://search.nixos.org/options and in the NixOS manual (`nixos-help`). + +{ config, lib, pkgs, ... }: + +{ + imports = + [ # Include the results of the hardware scan. + ./hardware-configuration.nix + ]; + + # Use the systemd-boot EFI boot loader. + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + + # networking.hostName = "nixos"; # Define your hostname. + + # Configure network connections interactively with nmcli or nmtui. + networking.networkmanager.enable = true; + + # Set your time zone. + # time.timeZone = "Europe/Amsterdam"; + + # Configure network proxy if necessary + # networking.proxy.default = "http://user:password@proxy:port/"; + # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; + + # Select internationalisation properties. + # i18n.defaultLocale = "en_US.UTF-8"; + # console = { + # font = "Lat2-Terminus16"; + # keyMap = "us"; + # useXkbConfig = true; # use xkb.options in tty. + # }; + + # Enable the X11 windowing system. + # services.xserver.enable = true; + + + + + # Configure keymap in X11 + # services.xserver.xkb.layout = "us"; + # services.xserver.xkb.options = "eurosign:e,caps:escape"; + + # Enable CUPS to print documents. + # services.printing.enable = true; + + # Enable sound. + # services.pulseaudio.enable = true; + # OR + # services.pipewire = { + # enable = true; + # pulse.enable = true; + # }; + + # Enable touchpad support (enabled default in most desktopManager). + # services.libinput.enable = true; + + # Define a user account. Don't forget to set a password with ‘passwd’. + # users.users.alice = { + # isNormalUser = true; + # extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user. + # packages = with pkgs; [ + # tree + # ]; + # }; + + # programs.firefox.enable = true; + + # List packages installed in system profile. + # You can use https://search.nixos.org/ to find more packages (and options). + # 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; + + # Copy the NixOS configuration file and link it from the resulting system + # (/run/current-system/configuration.nix). This is useful in case you + # accidentally delete configuration.nix. + # system.copySystemConfiguration = true; + + # This option defines the first version of NixOS you have installed on this particular machine, + # and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions. + # + # Most users should NEVER change this value after the initial install, for any reason, + # even if you've upgraded your system to a new NixOS release. + # + # This value does NOT affect the Nixpkgs version your packages and OS are pulled from, + # so changing it will NOT upgrade your system - see https://nixos.org/manual/nixos/stable/#sec-upgrading for how + # to actually do that. + # + # This value being lower than the current NixOS release does NOT mean your system is + # out of date, out of support, or vulnerable. + # + # Do NOT change this value unless you have manually inspected all the changes it would make to your configuration, + # and migrated your data accordingly. + # + # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion . + system.stateVersion = "25.11"; # Did you read the comment? + +} + diff --git a/nix/flake.nix b/nix/flake.nix index 227f843..b5905df 100644 --- a/nix/flake.nix +++ b/nix/flake.nix @@ -35,5 +35,8 @@ # Optionally use extraSpecialArgs # to pass through arguments to home.nix }; + nixosConfigurations.nixos = nixpkgs.lib.nixosSystem { + modules = [ ./configuration.nix ]; + }; }; } diff --git a/nix/hardware-configuration.nix b/nix/hardware-configuration.nix new file mode 100644 index 0000000..dd3fd25 --- /dev/null +++ b/nix/hardware-configuration.nix @@ -0,0 +1,18 @@ +# 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" "ahci" "usbhid" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-amd" ]; + boot.extraModulePackages = [ ]; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/nix/home.nix b/nix/home.nix index bcf93f1..61259e5 100644 --- a/nix/home.nix +++ b/nix/home.nix @@ -23,24 +23,12 @@ # The home.packages option allows you to install Nix packages into your # environment. - home.packages = [ - # # Adds the 'hello' command to your environment. It prints a friendly - # # "Hello, world!" when run. - pkgs.hello - pkgs.vim - - # # It is sometimes useful to fine-tune packages, for example, by applying - # # overrides. You can do that directly here, just don't forget the - # # parentheses. Maybe you want to install Nerd Fonts with a limited number of - # # fonts? - # (pkgs.nerdfonts.override { fonts = [ "FantasqueSansMono" ]; }) - - # # You can also create simple shell scripts directly inside your - # # configuration. For example, this adds a command 'my-hello' to your - # # environment: - # (pkgs.writeShellScriptBin "my-hello" '' - # echo "Hello, ${config.home.username}!" - # '') + home.packages = with pkgs; [ + hello + vim + telegram-desktop + vesktop + spotify ]; # Home Manager is pretty good at managing dotfiles. The primary way to manage diff --git a/nix/modules/neovim/home.nix b/nix/modules/neovim/home.nix index b7c330d..a680b10 100644 --- a/nix/modules/neovim/home.nix +++ b/nix/modules/neovim/home.nix @@ -1,8 +1,12 @@ -{ inputs, pkgs, ... }: +{ inputs, pkgs, config, ... }: let in { home.packages = [ pkgs.neovim ]; + xdg.configFile."nvim" = { + recursive = true; + source = config.lib.file.mkOutOfStoreSymlink "/home/doloro/dotfiles/nvim"; + }; } diff --git a/nix/result b/nix/result deleted file mode 120000 index d9bde64..0000000 --- a/nix/result +++ /dev/null @@ -1 +0,0 @@ -/nix/store/pb01777vslzr04k4jzi9kdyn8qk3c5a1-home-manager-generation \ No newline at end of file