ref: nix conf

nix/hosts/thinkpad/configuration.nix

@@ -1,42 +1,47 @@
-# 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,
   ...
 }: {
+  # TODO: maybe break these into files
   imports = [
     ./hardware-configuration.nix
   ];
 
+  ##############
+  # bootloader #
+  ##############
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
 
+  ##############
+  # Networking #
+  ##############
   networking.hostName = "nixie";
-
-  # Configure network proxy if necessary
-  # networking.proxy.default = "http://user:password@proxy:port/";
-  # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
-
   networking.networkmanager.enable = true;
 
+  ##########
+  # Locale #
+  ##########
   time.timeZone = "Europe/Paris";
-
-  i18n.defaultLocale = "en_US.UTF-8";
-
-  i18n.extraLocaleSettings = {
-    LC_ADDRESS = "fr_FR.UTF-8";
-    LC_IDENTIFICATION = "fr_FR.UTF-8";
-    LC_MEASUREMENT = "fr_FR.UTF-8";
-    LC_MONETARY = "fr_FR.UTF-8";
-    LC_NAME = "fr_FR.UTF-8";
-    LC_NUMERIC = "fr_FR.UTF-8";
-    LC_PAPER = "fr_FR.UTF-8";
-    LC_TELEPHONE = "fr_FR.UTF-8";
-    LC_TIME = "fr_FR.UTF-8";
+  i18n = {
+    defaultLocale = "en_US.UTF-8";
+    extraLocaleSettings = {
+      LC_ADDRESS = "fr_FR.UTF-8";
+      LC_IDENTIFICATION = "fr_FR.UTF-8";
+      LC_MEASUREMENT = "fr_FR.UTF-8";
+      LC_MONETARY = "fr_FR.UTF-8";
+      LC_NAME = "fr_FR.UTF-8";
+      LC_NUMERIC = "fr_FR.UTF-8";
+      LC_PAPER = "fr_FR.UTF-8";
+      LC_TELEPHONE = "fr_FR.UTF-8";
+      LC_TIME = "fr_FR.UTF-8";
+    };
   };
 
+  ###################
+  # Keyboard layout #
+  ###################
   services.xserver = {
     layout = "us";
     xkbVariant = "dvorak";
@@ -47,11 +52,12 @@
     isNormalUser = true;
     description = "leana";
     extraGroups = ["networkmanager" "wheel"];
-    packages = with pkgs; [];
+    packages = [];
   };
 
-  # List packages installed in system profile. To search, run:
-  # $ nix search wget
+  #########################
+  # System level packages #
+  #########################
   environment.systemPackages = with pkgs; [
     curl
     vim
@@ -59,9 +65,24 @@
     git
     gcc
   ];
+  programs = {
+    gnome-terminal.enable = true;
+    firefox.enable = true;
+  };
 
-  nix.settings.allowed-users = ["leana"];
+  ##########
+  # Flakes #
+  ##########
+  nix = {
+    package = pkgs.nixFlakes;
+    extraOptions = ''
+      experimental-features = nix-command flakes
+    '';
+  };
 
+  ##################
+  # Window Manager #
+  ##################
   services.xserver = {
     enable = true;
     windowManager.xmonad = {
@@ -70,37 +91,15 @@
     };
     displayManager.gdm.enable = true;
   };
+  programs.nm-applet.enable = true;
 
-  programs = {
-    nm-applet.enable = true;
-    gnome-terminal.enable = true;
-    firefox.enable = true;
-    fish.enable = true;
-  };
-
+  #################
+  # Default Shell #
+  #################
+  environment.shells = [pkgs.fish];
   users.defaultUserShell = pkgs.fish;
-
-  # 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;
-  # };
+  programs.fish.enable = true;
 
   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
-  # 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 = "23.11"; # Did you read the comment?
+  system.stateVersion = "23.11";
 }

nix/hosts/thinkpad/home.nix

@@ -1,104 +0,0 @@
-{
-  config,
-  pkgs,
-  unstable,
-  ...
-}: {
-  home.username = "leana";
-  home.homeDirectory = "/home/leana";
-
-  home.stateVersion = "23.11";
-
-  nixpkgs.overlays = [
-    (final: prev: {
-      cmus = prev.cmus.overrideAttrs (old: {
-        patches =
-          (old.patches or [])
-          ++ [
-            (prev.fetchpatch {
-              url = "https://github.com/cmus/cmus/commit/4123b54bad3d8874205aad7f1885191c8e93343c.patch";
-              hash = "sha256-YKqroibgMZFxWQnbmLIHSHR5sMJduyEv6swnKZQ33Fg=";
-            })
-          ];
-      });
-    })
-  ];
-
-  home.packages = with pkgs; [
-    # text/editors
-    helix
-    gnused
-    neovim
-    ripgrep
-    vim
-    tmux
-
-    # nix
-    nil
-    alejandra
-
-    # shell
-    fish
-    (python39.withPackages (ps: with ps; [beautifulsoup4 requests]))
-    stow
-
-    fd
-    fzf
-    htop
-    starship
-    tree
-    vivid
-    rsync
-
-    # fancy utilities
-    figlet
-    macchina
-    ncdu
-    tldr
-
-    # git related
-    bat
-    delta
-    gnupg
-
-    (nerdfonts.override {
-      fonts = ["CascadiaCode" "JetBrainsMono" "Meslo"];
-    })
-
-    asciinema
-    cmus
-    cmusfm
-    hyperfine
-    tea
-    yt-dlp
-    watchexec
-
-    # jdk17
-    # rustup
-    # nodejs_20
-
-    unstable.typst
-
-    # # NOTE: doesn't work
-    # valgrind
-
-    # gdb
-
-    # new stuff
-    dmenu
-    xmobar
-    scrot
-    xscreensaver
-    trayer
-    xclip
-  ];
-
-  programs = {
-    home-manager.enable = true;
-
-    direnv = {
-      enable = true;
-      nix-direnv.enable = true;
-    };
-  };
-}