commit 4622aaafb1df2d7c05200fbc0096d17acd7f82be Author: irl Date: Fri Jun 6 06:46:08 2025 +0100 feat: initial commit diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..8f53cb4 --- /dev/null +++ b/flake.lock @@ -0,0 +1,81 @@ +{ + "nodes": { + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "home-manager": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1749131129, + "narHash": "sha256-tJ+93i7N4QttM75bE8T09LlSU3Mv6Dfi9WaVBvlWilo=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "13a45ede6c17b5e923dfc18a40a3f646436f4809", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1749145035, + "narHash": "sha256-7hU9TqHpz3BhcgoP3J/udnvZ3QCurGEBD+ERhvKbJEE=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "a537c74d1071ca48aa835f731998094a4058a6f3", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "flake-utils": "flake-utils", + "home-manager": "home-manager", + "nixpkgs": "nixpkgs" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..abb88e1 --- /dev/null +++ b/flake.nix @@ -0,0 +1,53 @@ +{ + description = "I have no idea what I'm doing"; + + inputs = { + nixpkgs.url = "github:nixos/nixpkgs"; + flake-utils.url = "github:numtide/flake-utils"; + home-manager = { + url = "github:nix-community/home-manager"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + # nur = { + # url = "github:nix-community/NUR"; + # inputs.nixpkgs.follows = "nixpkgs"; + # }; + }; + outputs = + { + nixpkgs, + flake-utils, + home-manager, + ... + }: + { + nixosConfigurations = { + laptop = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + modules = [ + ./nixos/common.nix + ./nixos/hosts/laptop/default.nix + ./nixos/hosts/laptop/hardware-configuration.nix + ]; + }; + }; + } + // flake-utils.lib.eachSystem flake-utils.lib.allSystems (system: { + formatter = nixpkgs.legacyPackages.${system}.nixfmt-rfc-style; + packages.homeConfigurations = { + irl = home-manager.lib.homeManagerConfiguration { + pkgs = import nixpkgs { inherit system; }; + modules = [ ./home/irl.nix ]; + }; + irl-gui = home-manager.lib.homeManagerConfiguration { + pkgs = import nixpkgs { inherit system; }; + modules = [ + ./home/irl.nix + { + irl.gui-packages = true; + } + ]; + }; + }; + }); +} diff --git a/home/irl.nix b/home/irl.nix new file mode 100644 index 0000000..a0470d3 --- /dev/null +++ b/home/irl.nix @@ -0,0 +1,100 @@ +{ + config, + pkgs, + lib, + ... +}: + +let + cfg = config.irl; +in +{ + options.irl.gui-packages = lib.mkEnableOption "GUI packages managed by home-manager"; + + config = { + home.username = "irl"; + home.homeDirectory = "/home/irl"; + home.stateVersion = "25.05"; + home.packages = with pkgs; [ + fish + neofetch + starship + tree + ]; + home.shellAliases = { + hms = + "home-manager switch --flake ~/.config/nix-configs#irl" + (if cfg.gui-packages then "-gui" else ""); + }; + programs.bash = { + enable = true; + initExtra = '' + if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]] + then + shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION="" + exec ${pkgs.fish}/bin/fish $LOGIN_OPTION + fi + ''; + }; + programs.firefox = lib.mkIf cfg.gui-packages { + enable = true; + profiles.irl = { + extensions = { + # packages = with pkgs.nur.repos.rycee.firefox-addons; [ + # bitwarden + # kagi-search + # privacy-badger + # ]; + }; + }; + }; + programs.fish.enable = true; + programs.fzf = { + enable = true; + enableFishIntegration = true; + }; + programs.git = { + delta.enable = true; + enable = true; + extraConfig = { + diff = { + algorithm = "histogram"; + }; + init = { + defaultBranch = "main"; + }; + rebase = { + autosquash = true; + autostash = true; + }; + url = { + "git@github.com:".pushInsteadOf = "https://github.com/"; + "git@gitlab.com:".pushInsteadOf = "https://gitlab.com/"; + "git@guardianproject.dev:".pushInsteadOf = "https://guardianproject.dev/"; + }; + user = { + name = "irl"; + email = "iain@learmonth.me"; + }; + }; + }; + programs.home-manager.enable = true; + programs.neovim = { + defaultEditor = true; + enable = true; + viAlias = true; + vimAlias = true; + vimdiffAlias = true; + plugins = with pkgs.vimPlugins; [ + bufferline-nvim + nvim-treesitter.withAllGrammars + ]; + }; + programs.starship = { + enable = true; + enableFishIntegration = true; + enableInteractive = true; + enableTransience = true; + }; + programs.zellij.enable = true; + }; +} diff --git a/nixos/common.nix b/nixos/common.nix new file mode 100644 index 0000000..fac3781 --- /dev/null +++ b/nixos/common.nix @@ -0,0 +1,21 @@ +{ ... }: + +{ + nix.settings.experimental-features = "nix-command flakes"; + + time.timeZone = "Europe/London"; + + i18n.defaultLocale = "en_GB.UTF-8"; + + i18n.extraLocaleSettings = { + LC_ADDRESS = "en_GB.UTF-8"; + LC_IDENTIFICATION = "en_GB.UTF-8"; + LC_MEASUREMENT = "en_GB.UTF-8"; + LC_MONETARY = "en_GB.UTF-8"; + LC_NAME = "en_GB.UTF-8"; + LC_NUMERIC = "en_GB.UTF-8"; + LC_PAPER = "en_GB.UTF-8"; + LC_TELEPHONE = "en_GB.UTF-8"; + LC_TIME = "en_GB.UTF-8"; + }; +} diff --git a/nixos/hosts/laptop/default.nix b/nixos/hosts/laptop/default.nix new file mode 100644 index 0000000..f81eb56 --- /dev/null +++ b/nixos/hosts/laptop/default.nix @@ -0,0 +1,60 @@ +{ config, pkgs, ... }: + +{ + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + + boot.initrd.luks.devices."luks-2f61d72f-848d-487d-be98-eb0b68842d5c".device = + "/dev/disk/by-uuid/2f61d72f-848d-487d-be98-eb0b68842d5c"; + networking.hostName = "laptop"; + + networking.networkmanager.enable = true; + + services.xserver.enable = true; + + services.displayManager.gdm.enable = true; + services.desktopManager.gnome.enable = true; + + services.xserver.xkb = { + layout = "gb"; + variant = ""; + }; + + console.keyMap = "uk"; + + services.printing.enable = true; + services.pulseaudio.enable = false; + security.rtkit.enable = true; + services.pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + }; + + users.users.irl = { + isNormalUser = true; + description = "irl"; + extraGroups = [ + "networkmanager" + "wheel" + ]; + }; + + nixpkgs.config.allowUnfree = true; + + environment.systemPackages = with pkgs; [ + curl + home-manager + neovim + wget + ]; + + hardware.gpgSmartcards.enable = true; + programs.gnupg.agent = { + enable = true; + enableSSHSupport = true; + }; + + system.stateVersion = "25.05"; +} diff --git a/nixos/hosts/laptop/hardware-configuration.nix b/nixos/hosts/laptop/hardware-configuration.nix new file mode 100644 index 0000000..ba62130 --- /dev/null +++ b/nixos/hosts/laptop/hardware-configuration.nix @@ -0,0 +1,57 @@ +# 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" + "usb_storage" + "sd_mod" + ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-amd" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = { + device = "/dev/disk/by-uuid/09ccfb77-74dd-481a-a9d6-104e0340fd67"; + fsType = "ext4"; + }; + + boot.initrd.luks.devices."luks-03e009d9-7251-4094-b4f0-bc950ef05c98".device = + "/dev/disk/by-uuid/03e009d9-7251-4094-b4f0-bc950ef05c98"; + + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/9B25-EC01"; + fsType = "vfat"; + options = [ + "fmask=0077" + "dmask=0077" + ]; + }; + + swapDevices = [ + { device = "/dev/disk/by-uuid/91eff84a-51be-4448-a487-d6a33d0b3a80"; } + ]; + + # 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.wlp1s0.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +}