From 8434264a5264513a83c981d8d3a282608fcf415d Mon Sep 17 00:00:00 2001 From: deadvey Date: Mon, 11 Nov 2024 23:53:28 +0000 Subject: [PATCH] 19 current 2024-11-10 17:01:49 24.05.6463.83fb6c028368 6.6.59 * --- .gitignore | 3 - configuration.nix | 118 ---------------------------------------- editconfig | 4 +- nixos/configuration.nix | 1 - 4 files changed, 2 insertions(+), 124 deletions(-) delete mode 100644 .gitignore delete mode 100644 configuration.nix diff --git a/.gitignore b/.gitignore deleted file mode 100644 index b792cc9..0000000 --- a/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -.gitignore -nixos-switch.log -home-switch.log diff --git a/configuration.nix b/configuration.nix deleted file mode 100644 index ab1f2ad..0000000 --- a/configuration.nix +++ /dev/null @@ -1,118 +0,0 @@ -# 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 - ]; - - # Bootloader. - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; - - networking.hostName = "nixos"; # Define your hostname. - # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. - - # Configure network proxy if necessary - # networking.proxy.default = "http://user:password@proxy:port/"; - # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; - - # Enable Hyprland - programs.hyprland.enable = true; - - # Enable networking - networking.networkmanager.enable = true; - - # Enable NTFS support at boot - boot.supportedFilesystems = [ "ntfs" ]; - - # Set your time zone. - time.timeZone = "Europe/London"; - - # Select internationalisation properties. - 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"; - }; - - # Configure keymap in X11 - services.xserver.xkb = { - layout = "gb"; - variant = ""; - }; - - # Configure console keymap - console.keyMap = "uk"; - - # Define a user account. Don't forget to set a password with ‘passwd’. - users.users.deadvey = { - isNormalUser = true; - description = "deadvey"; - extraGroups = [ "networkmanager" "wheel" ]; - packages = with pkgs; [ - ]; - }; - - # List packages installed in system profile. To search, run: - # $ nix search wget - environment.systemPackages = with pkgs; [ - neovim - wget - git - lynx - hyprland - ]; - - fonts.packages = with pkgs; [ - noto-fonts - noto-fonts-cjk - noto-fonts-emoji - liberation_ttf - fira-code - fira-code-symbols - mplus-outline-fonts.githubRelease - dina-font - proggyfonts - victor-mono - ]; - - # 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; - - # 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 = "unstable"; # Did you read the comment? -} diff --git a/editconfig b/editconfig index 6fc65bc..1a07f19 100755 --- a/editconfig +++ b/editconfig @@ -1,11 +1,11 @@ sudo nvim /etc/nixos/configuration.nix -sudo nixos-rebuild switch &>nixos/nixos-switch.log || ( +sudo nixos-rebuild switch &>nixos-switch.log || ( cat nixos-switch.log | grep --color error && false) gen=$(nixos-rebuild list-generations | grep current) sudo cp /etc/nixos/configuration.nix ./nixos/configuration.nix git add . git commit -m "$gen" -if grep -q "error" nixos/nixos-switch.log; then +if grep -q "error" nixos-switch.log; then echo "There was an error in your Nix Config, please fix it before you push to git" else git push diff --git a/nixos/configuration.nix b/nixos/configuration.nix index ab1f2ad..64c6bfe 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -57,7 +57,6 @@ # Configure console keymap console.keyMap = "uk"; - # Define a user account. Don't forget to set a password with ‘passwd’. users.users.deadvey = { isNormalUser = true; description = "deadvey";