diff options
| -rw-r--r-- | apps/nixvim.nix | 32 | ||||
| -rw-r--r-- | configuration.nix | 92 | ||||
| -rw-r--r-- | flake.lock | 273 | ||||
| -rw-r--r-- | flake.nix | 16 | ||||
| -rw-r--r-- | hardware-configuration.nix | 14 | ||||
| -rw-r--r-- | home.nix | 4 |
6 files changed, 127 insertions, 304 deletions
diff --git a/apps/nixvim.nix b/apps/nixvim.nix index 9be4721..c5ff3fd 100644 --- a/apps/nixvim.nix +++ b/apps/nixvim.nix @@ -1,7 +1,7 @@ { config, pkgs, inputs, ... }: { - imports = [ inputs.nixvim.homeManagerModules.nixvim ]; + imports = [ inputs.nixvim.homeModules.nixvim ]; programs.nixvim = { enable = true; @@ -23,7 +23,6 @@ key = ";"; action = ":"; } - { key = "<leader>gg"; action = "<cmd>Man<CR>"; @@ -46,6 +45,16 @@ mouse = "a"; }; + colorschemes.gruvbox = { + enable = true; + settings = { + integrations = { + cmp = true; + }; + terminal_colors = true; + }; + }; + plugins = { lazy.enable = true; @@ -59,12 +68,6 @@ }; }; - treesitter = { - enable = true; - folding = false; - settings.indent.enable = true; - }; - lsp = { enable = true; servers = { @@ -121,19 +124,6 @@ }; web-devicons.enable = true; - - lualine.enable = true; - }; - - colorschemes.gruvbox = { - enable = true; - settings = { - integrations = { - cmp = true; - treesitter = true; - }; - terminal_colors = true; - }; }; extraPlugins = with pkgs.vimPlugins; [ vim-toml ]; diff --git a/configuration.nix b/configuration.nix index 9c85813..b5ce96f 100644 --- a/configuration.nix +++ b/configuration.nix @@ -2,13 +2,23 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ config, pkgs, inputs, ... }: { - imports = [ # Include the results of the hardware scan. +{ + config, + pkgs, + inputs, + ... +}: +{ + imports = [ + # Include the results of the hardware scan. ./hardware-configuration.nix inputs.home-manager.nixosModules.default ]; - nix.settings.experimental-features = [ "nix-command" "flakes" ]; + nix.settings.experimental-features = [ + "nix-command" + "flakes" + ]; # Bootloader. boot.loader.efi.canTouchEfiVariables = true; @@ -18,20 +28,34 @@ boot.loader.grub.useOSProber = true; boot.supportedFilesystems = [ "ntfs" ]; boot.kernelPackages = pkgs.linuxPackages_latest; - boot.kernelModules = - [ "kvm-amd" "vfio_virqfd" "vfio_pci" "vfio_iommu_type1" "vfio" ]; - boot.kernelParams = [ "amd_iommu=on" "amd_iommu=pt" "kvm.ignore_msrs=1" ]; + boot.kernelModules = [ + "kvm-amd" + "vfio_virqfd" + "vfio_pci" + "vfio_iommu_type1" + "vfio" + ]; + boot.kernelParams = [ + "amd_iommu=on" + "amd_iommu=pt" + "kvm.ignore_msrs=1" + ]; boot.extraModprobeConfig = "options vfio-pci ids=10de:25ac"; networking = { # dns.mullvad.net # nameservers = [ "194.242.2.2" ]; - networkmanager = { enable = true; }; + networkmanager = { + enable = true; + }; dhcpcd.extraConfig = "nohook resolv.conf"; hostName = "nixos"; # Define your hostname. - wireless.enable = false; # Enables wireless support via wpa_supplicant. + wireless.enable = true; # Enables wireless support via wpa_supplicant. firewall.enable = true; - firewall.allowedTCPPorts = [ 80 3000 ]; + firewall.allowedTCPPorts = [ + 80 + 3000 + ]; }; # touchpad @@ -47,7 +71,7 @@ # # # Nvidia power management. Experimental, and can cause sleep/suspend to fail. # # Enable this if you have graphical corruption issues or application crashes after waking - # # up from sleep. This fixes it by saving the entire VRAM memory to /tmp/ instead + # # up from sleep. This fixes it by saving the entire VRAM memory to /tmp/ instead # # of just the bare essentials. # powerManagement.enable = false; # @@ -57,9 +81,9 @@ # # # Use the NVidia open source kernel module (not to be confused with the # # independent third-party "nouveau" open source driver). - # # Support is limited to the Turing and later architectures. Full list of - # # supported GPUs is at: - # # https://github.com/NVIDIA/open-gpu-kernel-modules#compatible-gpus + # # Support is limited to the Turing and later architectures. Full list of + # # supported GPUs is at: + # # https://github.com/NVIDIA/open-gpu-kernel-modules#compatible-gpus # # Only available from driver 515.43.04+ # # Currently alpha-quality/buggy, so false is currently the recommended setting. # open = false; @@ -70,7 +94,7 @@ # # # Optionally, you may need to select the appropriate driver version for your specific GPU. # package = config.boot.kernelPackages.nvidiaPackages.stable; - # + # # prime = { # offload = { # enable = true; @@ -78,7 +102,7 @@ # }; # # # Make sure to use the correct Bus ID values for your system! - # amdgpuBusId = "PCI:115:0:0"; + # amdgpuBusId = "PCI:115:0:0"; # nvidiaBusId = "PCI:1:0:0"; # }; # }; @@ -129,23 +153,27 @@ default = { ids = [ "*" ]; - settings = { main = { capslock = "backspace"; }; }; + settings = { + main = { + capslock = "backspace"; + }; + }; }; }; }; # compostior services.picom.enable = true; - # login - services.logind.extraConfig = '' - HandlePowerKey=ignore - ''; - # Define a user account. Don't forget to set a password with ‘passwd’. users.users.ozpv = { isNormalUser = true; description = "ozpv"; - extraGroups = [ "networkmanager" "wheel" "libvirtd" "docker" ]; + extraGroups = [ + "networkmanager" + "wheel" + "libvirtd" + "docker" + ]; packages = with pkgs; [ ]; shell = pkgs.zsh; }; @@ -153,12 +181,16 @@ # lock screen programs.slock.enable = true; - home-manager = { users.ozpv = { imports = [ ./home.nix ]; }; }; + home-manager = { + users.ozpv = { + imports = [ ./home.nix ]; + }; + }; # Allow unfree packages nixpkgs.config.allowUnfree = true; - # docker + # docker virtualisation.docker.enable = true; virtualisation.docker.rootless = { @@ -169,10 +201,9 @@ # List packages installed in system profile. To search, run: # $ nix search wget environment.systemPackages = with pkgs; [ - nixfmt-classic + nixfmt libinput-gestures brightnessctl - discord vim networkmanagerapplet (st.overrideAttrs { @@ -202,6 +233,9 @@ git home-manager xclip + veracrypt + keepassxc + fastfetch ]; # neovim @@ -237,8 +271,8 @@ # audio services.pipewire.enable = false; - hardware.pulseaudio.enable = true; - hardware.pulseaudio.package = pkgs.pulseaudioFull; + services.pulseaudio.enable = true; + services.pulseaudio.package = pkgs.pulseaudioFull; # shell programs.zsh.enable = true; @@ -266,6 +300,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 = "25.11"; # Did you read the comment? + system.stateVersion = "26.05"; # Did you read the comment? } @@ -1,40 +1,5 @@ { "nodes": { - "devshell": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1728330715, - "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=", - "owner": "numtide", - "repo": "devshell", - "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, - "flake-compat": { - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "revCount": 57, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -43,11 +8,11 @@ ] }, "locked": { - "lastModified": 1733312601, - "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "lastModified": 1778716662, + "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb", "type": "github" }, "original": { @@ -56,88 +21,16 @@ "type": "github" } }, - "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" - } - }, - "git-hooks": { - "inputs": { - "flake-compat": [ - "nixvim", - "flake-compat" - ], - "gitignore": "gitignore", - "nixpkgs": [ - "nixvim", - "nixpkgs" - ], - "nixpkgs-stable": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1734797603, - "narHash": "sha256-ulZN7ps8nBV31SE+dwkDvKIzvN6hroRY8sYOT0w+E28=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "f0f0dc4920a903c3e08f5bdb9246bb572fcae498", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, - "gitignore": { - "inputs": { - "nixpkgs": [ - "nixvim", - "git-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, "home-manager": { "inputs": { - "nixpkgs": [ - "nixpkgs" - ] + "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1734992499, - "narHash": "sha256-f9UyHMTb+BwF6RDZ8eO9HOkSlKeeSPBlcYhMmV1UNIk=", + "lastModified": 1779726696, + "narHash": "sha256-/p37CB5n6Wpw250b0Lq0CYwNq2D8uGKzDoBulyLcQqA=", "owner": "nix-community", "repo": "home-manager", - "rev": "f1b1786ea77739dcd181b920d430e30fb1608b8a", + "rev": "1a95e2efb477959b70b4a14c51035975c0481df6", "type": "github" }, "original": { @@ -146,112 +39,66 @@ "type": "github" } }, - "home-manager_2": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, + "nixpkgs": { "locked": { - "lastModified": 1734862405, - "narHash": "sha256-bXZJvUMJ2A6sIpYcCUAGjYCD5UDzmpmQCdmJSkPhleU=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "cb27edb5221d2f2920a03155f8becc502cf60e35", + "lastModified": 1779508470, + "narHash": "sha256-Ap9KJX+5xHIn3bPIpfNgT6MEXdAECECwo4/rmlQD74M=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "29916453413845e54a65b8a1cf996842300cd299", "type": "github" }, "original": { - "owner": "nix-community", - "repo": "home-manager", + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", "type": "github" } }, - "ixx": { - "inputs": { - "flake-utils": [ - "nixvim", - "nuschtosSearch", - "flake-utils" - ], - "nixpkgs": [ - "nixvim", - "nuschtosSearch", - "nixpkgs" - ] - }, + "nixpkgs_2": { "locked": { - "lastModified": 1729958008, - "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=", - "owner": "NuschtOS", - "repo": "ixx", - "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb", + "lastModified": 1779622335, + "narHash": "sha256-ViA62qtL5za7V3d5I8OA9q9JcFhsVAiL5jVHwEclWqk=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "705e9929918b43bd7b715dc0a878ac870449bb03", "type": "github" }, "original": { - "owner": "NuschtOS", - "ref": "v0.0.6", - "repo": "ixx", + "owner": "nixos", + "ref": "nixos-26.05", + "repo": "nixpkgs", "type": "github" } }, - "nix-darwin": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, + "nixpkgs_3": { "locked": { - "lastModified": 1733570843, - "narHash": "sha256-sQJAxY1TYWD1UyibN/FnN97paTFuwBw3Vp3DNCyKsMk=", - "owner": "lnl7", - "repo": "nix-darwin", - "rev": "a35b08d09efda83625bef267eb24347b446c80b8", - "type": "github" - }, - "original": { - "owner": "lnl7", - "repo": "nix-darwin", - "type": "github" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1734649271, - "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", - "owner": "nixos", + "lastModified": 1779259093, + "narHash": "sha256-7DKWmH23hL2eYdkxCKeqj2i+yljTKuU+3Nk1UPHOnxc=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", + "rev": "d99b013d5d1931ad77fe3912ed218170dec5d9a4", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-unstable", + "owner": "NixOS", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, "nixvim": { "inputs": { - "devshell": "devshell", - "flake-compat": "flake-compat", "flake-parts": "flake-parts", - "git-hooks": "git-hooks", - "home-manager": "home-manager_2", - "nix-darwin": "nix-darwin", - "nixpkgs": [ - "nixpkgs" - ], - "nuschtosSearch": "nuschtosSearch", - "treefmt-nix": "treefmt-nix" + "nixpkgs": "nixpkgs_3", + "systems": "systems" }, "locked": { - "lastModified": 1734956286, - "narHash": "sha256-8h7Fs6S+Ftg3NNmwT/KkYWI9epUNPCMPn56QFXOfmTM=", + "lastModified": 1779683452, + "narHash": "sha256-Ksx8jghpDBCPDiTaTyGhYUXG1BUwqPjf5pajl0q0cqA=", "owner": "nix-community", "repo": "nixvim", - "rev": "8938e09db14d510dcc2f266e8b2e738ee527d386", + "rev": "afec1bae0e6f7983a5c03ec559f7ed2ec0e714a9", "type": "github" }, "original": { @@ -260,33 +107,10 @@ "type": "github" } }, - "nuschtosSearch": { - "inputs": { - "flake-utils": "flake-utils", - "ixx": "ixx", - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1733773348, - "narHash": "sha256-Y47y+LesOCkJaLvj+dI/Oa6FAKj/T9sKVKDXLNsViPw=", - "owner": "NuschtOS", - "repo": "search", - "rev": "3051be7f403bff1d1d380e4612f0c70675b44fc9", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "repo": "search", - "type": "github" - } - }, "root": { "inputs": { "home-manager": "home-manager", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "nixvim": "nixvim" } }, @@ -304,27 +128,6 @@ "repo": "default", "type": "github" } - }, - "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1734704479, - "narHash": "sha256-MMi74+WckoyEWBRcg/oaGRvXC9BVVxDZNRMpL+72wBI=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "65712f5af67234dad91a5a4baee986a8b62dbf8f", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } } }, "root": "root", @@ -2,25 +2,29 @@ description = "Nixos config flake"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-26.05"; home-manager = { url = "github:nix-community/home-manager"; - inputs.nixpkgs.follows = "nixpkgs"; }; nixvim = { url = "github:nix-community/nixvim"; - # If using a stable channel you can use `url = "github:nix-community/nixvim/nixos-<version>"` - inputs.nixpkgs.follows = "nixpkgs"; }; }; - outputs = { nixpkgs, home-manager, nixvim, ... }@inputs: + outputs = + { + nixpkgs, + home-manager, + nixvim, + ... + }@inputs: let system = "x86_64-linux"; pkgs = nixpkgs.legacyPackages.${system}; - in { + in + { nixosConfigurations.ozpv = nixpkgs.lib.nixosSystem { specialArgs = { inherit inputs; }; modules = [ diff --git a/hardware-configuration.nix b/hardware-configuration.nix index c5d7f20..a925e9b 100644 --- a/hardware-configuration.nix +++ b/hardware-configuration.nix @@ -14,26 +14,18 @@ boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/5ea6ee93-a059-4711-8658-48d5b376751d"; + { device = "/dev/disk/by-uuid/2e9244f1-463e-465a-914e-28ab18837d77"; fsType = "ext4"; }; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/2ECD-DD79"; + { device = "/dev/disk/by-uuid/C0B5-C3DE"; fsType = "vfat"; - options = [ "fmask=0022" "dmask=0022" ]; + 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.<interface>.useDHCP`. - networking.useDHCP = lib.mkDefault true; - # networking.interfaces.docker0.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; } @@ -5,7 +5,7 @@ home.username = "ozpv"; home.homeDirectory = "/home/ozpv"; - home.stateVersion = "25.05"; + home.stateVersion = "26.05"; gtk.enable = true; @@ -14,7 +14,7 @@ nixpkgs.config.allowUnfree = true; - home.packages = with pkgs; [ veracrypt keepassxc neofetch ]; + home.packages = with pkgs; [ ]; home.sessionVariables = { EDITOR = "nvim"; }; |