From 848f4ebe939550cbb83c79121b87388a8d5f726c Mon Sep 17 00:00:00 2001 From: stitchy Date: Sun, 6 Aug 2023 01:44:35 +0000 Subject: [PATCH 1/3] initial flake commit --- flake.nix | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 flake.nix diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..278e247 --- /dev/null +++ b/flake.nix @@ -0,0 +1,21 @@ +{ + description = "System Configuration Flake"; + + inputs = { + nixpkgs = { + url = "github:NixOS/nixpkgs/nixos-unstable" + }; + }; + + outputs = { self, nixpkgs }: { + + nixosConfigurations = { + stitchynyan = nixpkgs.lib.nixosSystem { + system = "x86_64-linux" + modules = [ + ./configuration.nix + ]; + }; + }; + }; +} From dd9c0eeff61a7df532886556ba40b1ac24165b65 Mon Sep 17 00:00:00 2001 From: stitchy Date: Sun, 6 Aug 2023 01:48:10 +0000 Subject: [PATCH 2/3] add moar intro stuff --- configuration.nix | 209 +++++++++++++++++++++++++++++++++++++ flake.lock | 27 +++++ hardware-configuration.nix | 36 +++++++ 3 files changed, 272 insertions(+) create mode 100644 configuration.nix create mode 100644 flake.lock create mode 100644 hardware-configuration.nix diff --git a/configuration.nix b/configuration.nix new file mode 100644 index 0000000..88ec3b0 --- /dev/null +++ b/configuration.nix @@ -0,0 +1,209 @@ +# 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 = + [ # Include the results of the hardware scan. + ./hardware-configuration.nix + ]; + + # Use the systemd-boot EFI boot loader. + boot.kernelPackages = pkgs.linuxPackages_zen; + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = false; + boot.kernelParams = [ + "intel_pstate=no_hwp" + "kernel.yama.ptrace_scope=0" + "mem_sleep_default=deep" + "module_blacklist=hid_sensor_hub" + "intel_iommu=on" + "iommu=pt" + "i915.enable_guc=7" + ]; + + nix.settings.experimental-features = [ "nix-command" "flakes" ]; + nix = { + package = pkgs.nixFlakes; + extraOptions = '' + experimental-features = nix-command flakes + ''; +}; + + system.nixos.tags = [ "Nya_Beginnings" ]; + + + networking.hostName = "stitchynyan"; # Define your hostname. + # Pick only one of the below networking options. + # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. + networking.networkmanager.enable = true; # Easiest to use and most distros use this by default. + + # Set your time zone. + time.timeZone = "America/Lost_Angeles"; + + # 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 xkbOptions in tty. + # }; + + # Enable the X11 windowing system. + services.xserver.enable = false; + + + + + # Configure keymap in X11 + # services.xserver.layout = "us"; + # services.xserver.xkbOptions = "eurosign:e,caps:escape"; + + # Enable CUPS to print documents. + services.printing.enable = true; + + + # Enable touchpad support (enabled default in most desktopManager). + # services.xserver.libinput.enable = true; + + # List packages installed in system profile. To search, run: + # $ nix search wget + + environment.systemPackages = with pkgs; [ + wget + librewolf + kitty + exa + hyprland + git + zoxide + nheko + gnupg + hyprpaper + xdg-desktop-portal-hyprland + dunst + pavucontrol + slurp + grim + wofi + brightnessctl + imv + qt5ct + qt6ct + neofetch + wl-clipboard + glib + dracula-theme + btop + swaylock-effects + vimPlugins.nvim-lspconfig + vimPlugins.nvim-cmp + vimPlugins.cmp-nvim-lsp + vimPlugins.luasnip + vimPlugins.cmp_luasnip + vimPlugins.tokyonight-nvim + ]; + + fonts.packages= with pkgs; [ + noto-fonts + noto-fonts-emoji + liberation_ttf + nerdfonts + ]; + + programs.waybar.enable = true; + + security.pam.services.swaylock = {}; + security.rtkit.enable = true; + services.gnome.gnome-keyring.enable = true; + services.pipewire = { + enable = true; + pulse.enable = true; + alsa.enable = true; + }; + + programs.zsh.enable = true; + + programs.neovim = { + enable = true; + viAlias = true; + vimAlias = true; + defaultEditor = true; + configure = { + customRC = builtins.readFile /home/stitchynyan/.config/nvim/init.vim; + packages.myVimPackage = with pkgs.vimPlugins; { + start = [ + nvim-lspconfig + nvim-cmp + cmp-nvim-lsp + luasnip + cmp_luasnip + tokyonight-nvim + vim-lsp-cxx-highlight + ]; + }; + }; + }; + + hardware.opengl = { + enable = true; + driSupport = true; + extraPackages = with pkgs; [ + intel-compute-runtime + intel-media-driver + ]; + }; + + + users.mutableUsers = false; + users.users.stitchynyan = { + isNormalUser = true; + shell = pkgs.zsh; + home = "/home/stitchynyan"; + description = "Personal user"; + extraGroups = [ "wheel" "networkmanager" "kvm" "libvirt" "audio" ]; + initialHashedPassword = "$y$j9T$.1iv0BlWGzmxQlrpLGJ4H0$JhjoFDhA9mUpPa.uNbVhkBSiO/7rk8D2i.A4jUy94IC"; + }; + + # 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 = [ 22000 ]; + networking.firewall.allowedUDPPorts = [ 22000 ]; + # Or disable the firewall altogether. + networking.firewall.enable = true; + + + # 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 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.05"; # Did you read the comment? + +} + diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..137fbba --- /dev/null +++ b/flake.lock @@ -0,0 +1,27 @@ +{ + "nodes": { + "nixpkgs": { + "locked": { + "lastModified": 1691186842, + "narHash": "sha256-wxBVCvZUwq+XS4N4t9NqsHV4E64cPVqQ2fdDISpjcw0=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "18036c0be90f4e308ae3ebcab0e14aae0336fe42", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "nixpkgs": "nixpkgs" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/hardware-configuration.nix b/hardware-configuration.nix new file mode 100644 index 0000000..1f92a44 --- /dev/null +++ b/hardware-configuration.nix @@ -0,0 +1,36 @@ +# 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 = [ "xhci_pci" "thunderbolt" "nvme" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/d626409d-8166-45c2-a168-09dfab31b8a4"; + fsType = "btrfs"; + options = [ "subvol=@nix-root" ]; + }; + + boot.initrd.luks.devices."luksdev".device = "/dev/disk/by-uuid/100a5596-671b-48ba-a1d1-0723559baf87"; + + 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.wlp166s0.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} From c2796dcfb99ae2fa3745e8b162e5f11b49b29afd Mon Sep 17 00:00:00 2001 From: stitchy Date: Sun, 6 Aug 2023 04:03:24 +0000 Subject: [PATCH 3/3] more sanely split things --- configuration.nix | 87 +------------------ flake.nix | 21 ++++- hosts/default.nix | 9 ++ hosts/lappy/default.nix | 22 +++++ .../lappy/hardware-configuration.nix | 10 --- packages/art.nix | 15 ++++ packages/default.nix | 51 +++++++++++ 7 files changed, 118 insertions(+), 97 deletions(-) create mode 100644 hosts/default.nix create mode 100644 hosts/lappy/default.nix rename hardware-configuration.nix => hosts/lappy/hardware-configuration.nix (55%) create mode 100644 packages/art.nix create mode 100644 packages/default.nix diff --git a/configuration.nix b/configuration.nix index 88ec3b0..f986fab 100644 --- a/configuration.nix +++ b/configuration.nix @@ -8,7 +8,8 @@ { imports = [ # Include the results of the hardware scan. - ./hardware-configuration.nix + ./packages/default.nix + ./hosts/lappy/default.nix ]; # Use the systemd-boot EFI boot loader. @@ -26,27 +27,6 @@ ]; nix.settings.experimental-features = [ "nix-command" "flakes" ]; - nix = { - package = pkgs.nixFlakes; - extraOptions = '' - experimental-features = nix-command flakes - ''; -}; - - system.nixos.tags = [ "Nya_Beginnings" ]; - - - networking.hostName = "stitchynyan"; # Define your hostname. - # Pick only one of the below networking options. - # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. - networking.networkmanager.enable = true; # Easiest to use and most distros use this by default. - - # Set your time zone. - time.timeZone = "America/Lost_Angeles"; - - # 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"; @@ -59,67 +39,12 @@ # Enable the X11 windowing system. services.xserver.enable = false; - - - - # Configure keymap in X11 - # services.xserver.layout = "us"; - # services.xserver.xkbOptions = "eurosign:e,caps:escape"; - # Enable CUPS to print documents. services.printing.enable = true; - - # Enable touchpad support (enabled default in most desktopManager). - # services.xserver.libinput.enable = true; - - # List packages installed in system profile. To search, run: - # $ nix search wget - - environment.systemPackages = with pkgs; [ - wget - librewolf - kitty - exa - hyprland - git - zoxide - nheko - gnupg - hyprpaper - xdg-desktop-portal-hyprland - dunst - pavucontrol - slurp - grim - wofi - brightnessctl - imv - qt5ct - qt6ct - neofetch - wl-clipboard - glib - dracula-theme - btop - swaylock-effects - vimPlugins.nvim-lspconfig - vimPlugins.nvim-cmp - vimPlugins.cmp-nvim-lsp - vimPlugins.luasnip - vimPlugins.cmp_luasnip - vimPlugins.tokyonight-nvim - ]; - - fonts.packages= with pkgs; [ - noto-fonts - noto-fonts-emoji - liberation_ttf - nerdfonts - ]; - programs.waybar.enable = true; + # Swaylock allow to unlock security.pam.services.swaylock = {}; security.rtkit.enable = true; services.gnome.gnome-keyring.enable = true; @@ -191,12 +116,6 @@ # Or disable the firewall altogether. networking.firewall.enable = true; - - # 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 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 diff --git a/flake.nix b/flake.nix index 278e247..247b0fd 100644 --- a/flake.nix +++ b/flake.nix @@ -3,17 +3,32 @@ inputs = { nixpkgs = { - url = "github:NixOS/nixpkgs/nixos-unstable" + url = "github:NixOS/nixpkgs/nixos-unstable"; }; + + home-manager-unstable = { + url = "github:nix-community/home-manager/master"; + inputs.nixpkgs.follows = "nixpkgs-unstable"; + }; + + hyprland.url = "github:hyprwm/Hyprland"; }; - outputs = { self, nixpkgs }: { + outputs = { + self, + nixpkgs, + home-manager-unstable, + hyprland + }: { nixosConfigurations = { stitchynyan = nixpkgs.lib.nixosSystem { - system = "x86_64-linux" + system = "x86_64-linux"; modules = [ ./configuration.nix + home-manager-unstable.nixosModules.home-manager + hyprland.homeManagerModules.default + {wayland.windowManager.hyprland.enable = true;} ]; }; }; diff --git a/hosts/default.nix b/hosts/default.nix new file mode 100644 index 0000000..5258558 --- /dev/null +++ b/hosts/default.nix @@ -0,0 +1,9 @@ + +{config, pkg, home-manager, ...}: + +{ + + + + +} diff --git a/hosts/lappy/default.nix b/hosts/lappy/default.nix new file mode 100644 index 0000000..70602fd --- /dev/null +++ b/hosts/lappy/default.nix @@ -0,0 +1,22 @@ + + +{ config, pkgs, ... }: + +{ + + imports = [ + ./hardware-configuration.nix + ]; + + system.nixos.tags = [ "Nya_Beginnings" ]; + + networking.hostName = "stitchynyan"; + networking.networkmanager.enable = true; + time.timeZone = "America/Lost_Angeles"; + + + + + + +} diff --git a/hardware-configuration.nix b/hosts/lappy/hardware-configuration.nix similarity index 55% rename from hardware-configuration.nix rename to hosts/lappy/hardware-configuration.nix index 1f92a44..e4b52bd 100644 --- a/hardware-configuration.nix +++ b/hosts/lappy/hardware-configuration.nix @@ -1,6 +1,3 @@ -# 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, ... }: { @@ -23,13 +20,6 @@ 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.wlp166s0.useDHCP = lib.mkDefault true; - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; diff --git a/packages/art.nix b/packages/art.nix new file mode 100644 index 0000000..5e51933 --- /dev/null +++ b/packages/art.nix @@ -0,0 +1,15 @@ + +{ pkgs }: { + +environment.systemPackages = with pkgs; [ + blender + krita + #armorpaint + gimp + inkscape + #prusa slicker +]; + + + +} diff --git a/packages/default.nix b/packages/default.nix new file mode 100644 index 0000000..6aff7c8 --- /dev/null +++ b/packages/default.nix @@ -0,0 +1,51 @@ + +{pkgs}: { + + import = [ + ./art.nix + ./tools.nix + ]; + + environment.systemPackages = with pkgs; [ + wget + librewolf + kitty + exa + hyprland + git + zoxide + nheko + gnupg + hyprpaper + xdg-desktop-portal-hyprland + dunst + pavucontrol + slurp + grim + wofi + brightnessctl + imv + qt5ct + qt6ct + neofetch + wl-clipboard + glib + dracula-theme + btop + swaylock-effects + vimPlugins.nvim-lspconfig + vimPlugins.nvim-cmp + vimPlugins.cmp-nvim-lsp + vimPlugins.luasnip + vimPlugins.cmp_luasnip + vimPlugins.tokyonight-nvim + ]; + + fonts.packages= with pkgs; [ + noto-fonts + noto-fonts-emoji + liberation_ttf + nerdfonts + ]; + +}