From d530febc37f0eaaefd5e8f7cf0646ce91389146f Mon Sep 17 00:00:00 2001 From: deadvey Date: Mon, 11 Nov 2024 23:49:36 +0000 Subject: [PATCH] 19 current 2024-11-10 17:01:49 24.05.6463.83fb6c028368 6.6.59 * --- .gitignore | 4 +- editconfig | 6 +-- home-switch.log | 18 -------- nixos | 118 +++++++++++++++++++++++++++++++++++++++++++++++ nixos-switch.log | 6 --- 5 files changed, 124 insertions(+), 28 deletions(-) delete mode 100644 home-switch.log create mode 100644 nixos delete mode 100644 nixos-switch.log diff --git a/.gitignore b/.gitignore index a2bec3c..b792cc9 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ -nixos-switch.log \ No newline at end of file +.gitignore +nixos-switch.log +home-switch.log diff --git a/editconfig b/editconfig index f8d3fd6..004250c 100755 --- a/editconfig +++ b/editconfig @@ -1,11 +1,11 @@ sudo nvim /etc/nixos/configuration.nix -sudo nixos-rebuild switch &>nixos-switch.log || ( +sudo nixos-rebuild switch &>nixos/nixos-switch.log || ( cat nixos-switch.log | grep --color error && false) gen=$(nixos-rebuild list-generations | grep current) -sudo cp /etc/nixos/configuration.nix . +sudo cp /etc/nixos/configuration.nix ./nixos git add . git commit -m "$gen" -if grep -q "error" nixos-switch.log; then +if grep -q "error" nixos/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/home-switch.log b/home-switch.log deleted file mode 100644 index 34b3e3b..0000000 --- a/home-switch.log +++ /dev/null @@ -1,18 +0,0 @@ -/nix/store/pxc7kqi06r82jk7fdsr0542hycyjlifj-home-manager-generation -Starting Home Manager activation -Activating checkFilesChanged -Activating checkLinkTargets -Activating writeBoundary -Activating installPackages -replacing old 'home-manager-path' -installing 'home-manager-path' -Activating linkGeneration -Cleaning up orphan links from /home/deadvey -No change so reusing latest profile generation 88 -Creating home file links in /home/deadvey -Activating onFilesChange -Activating reloadSystemd - -There are 173 unread and relevant news items. -Read them by running the command "home-manager news". - diff --git a/nixos b/nixos new file mode 100644 index 0000000..ab1f2ad --- /dev/null +++ b/nixos @@ -0,0 +1,118 @@ +# 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/nixos-switch.log b/nixos-switch.log deleted file mode 100644 index cd02440..0000000 --- a/nixos-switch.log +++ /dev/null @@ -1,6 +0,0 @@ -building Nix... -building the system configuration... -activating the configuration... -setting up /etc... -reloading user units for deadvey... -restarting sysinit-reactivation.target