diff --git a/common.nix b/common.nix index 661e268..65e0601 100644 --- a/common.nix +++ b/common.nix @@ -58,8 +58,8 @@ in { fontDir.enable = true; packages = with pkgs; [ atkinson-hyperlegible - nerdfonts - fira-code-nerdfont + #nerdfonts + #fira-code-nerdfont ]; }; services = @@ -86,7 +86,7 @@ in { openFirewall = true; }; # smartd - smartd.enable = true; + smartd.enable = lib.mkDefault true; } # Mac Services // lib.optionalAttrs ((builtins.match ".*-darwin" pkgs.stdenv.hostPlatform.system) diff --git a/flake.lock b/flake.lock index 619f8a1..a8aafc4 100644 --- a/flake.lock +++ b/flake.lock @@ -155,11 +155,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1722232823, - "narHash": "sha256-TyBoea7IzssGHS/hn2qjqgHfrpRGdBwBj5JrzTk+LmE=", + "lastModified": 1722471252, + "narHash": "sha256-rgNPBiWN+y2jBiXIEgV/McBfkPeZax80eol0FBoupCk=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "a53756a2ea77e55b662c68c9a6cf6472a10ae911", + "rev": "fe7178b41d84add25c63a695620629050fb35bbd", "type": "github" }, "original": { @@ -171,11 +171,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1722175991, - "narHash": "sha256-IlmC/5lLdIq+sLdTAPkSsVpnrMr6wOS79kXSXcowQII=", + "lastModified": 1722463651, + "narHash": "sha256-3YorBqxT1RpL3Z2rLDCJhG+1HnBsgjrW8AOlTkFWlbA=", "owner": "neovim", "repo": "neovim", - "rev": "5aa1a9532cbac835ad027ebdf04311c7e8fb7007", + "rev": "e820474cde09273608be5f57e1032aab21e3c97d", "type": "github" }, "original": { @@ -189,11 +189,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1722082646, - "narHash": "sha256-od8dBWVP/ngg0cuoyEl/w9D+TCNDj6Kh4tr151Aax7w=", + "lastModified": 1722445220, + "narHash": "sha256-PW5FRqLhqg0xGpPjY2Poa464tyBQiyKd0tQGZ0HnMiU=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "0413754b3cdb879ba14f6e96915e5fdf06c6aab6", + "rev": "7e08a9dd34314fb8051c28b231a68726c54daa7b", "type": "github" }, "original": { @@ -204,11 +204,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1722062969, - "narHash": "sha256-QOS0ykELUmPbrrUGmegAUlpmUFznDQeR4q7rFhl8eQg=", + "lastModified": 1722185531, + "narHash": "sha256-veKR07psFoJjINLC8RK4DiLniGGMgF3QMlS4tb74S6k=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b73c2221a46c13557b1b3be9c2070cc42cf01eb3", + "rev": "52ec9ac3b12395ad677e8b62106f0b98c1f8569d", "type": "github" }, "original": { @@ -220,11 +220,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1722141560, - "narHash": "sha256-Ul3rIdesWaiW56PS/Ak3UlJdkwBrD4UcagCmXZR9Z7Y=", + "lastModified": 1722415718, + "narHash": "sha256-5US0/pgxbMksF92k1+eOa8arJTJiPvsdZj9Dl+vJkM4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "038fb464fcfa79b4f08131b07f2d8c9a6bcc4160", + "rev": "c3392ad349a5227f4a3464dce87bcc5046692fce", "type": "github" }, "original": { @@ -236,11 +236,11 @@ }, "nixpkgs-darwin": { "locked": { - "lastModified": 1722153173, - "narHash": "sha256-S46RmS9WkBOTLORpnWsNth4Ae6TlfJS9TKXqB55YQy4=", + "lastModified": 1722272837, + "narHash": "sha256-iHO942tXSkiZ0ZhWkfqCvqo9/67+S6WYfphXSJogEmM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7bba2df68503b68634e0070483ddaf6d59dc6530", + "rev": "89526a7d969e38fe8c30253170d44d0f131882de", "type": "github" }, "original": { @@ -252,11 +252,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1722141560, - "narHash": "sha256-Ul3rIdesWaiW56PS/Ak3UlJdkwBrD4UcagCmXZR9Z7Y=", + "lastModified": 1722415718, + "narHash": "sha256-5US0/pgxbMksF92k1+eOa8arJTJiPvsdZj9Dl+vJkM4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "038fb464fcfa79b4f08131b07f2d8c9a6bcc4160", + "rev": "c3392ad349a5227f4a3464dce87bcc5046692fce", "type": "github" }, "original": { @@ -282,11 +282,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1722087241, - "narHash": "sha256-2ShmEaFi0kJVOEEu5gmlykN5dwjWYWYUJmlRTvZQRpU=", + "lastModified": 1722221733, + "narHash": "sha256-sga9SrrPb+pQJxG1ttJfMPheZvDOxApFfwXCFO0H9xw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8c50662509100d53229d4be607f1a3a31157fa12", + "rev": "12bf09802d77264e441f48e25459c10c93eada2e", "type": "github" }, "original": { diff --git a/gastrin/configuration.nix b/gastrin/configuration.nix index 02942fd..e07c84a 100644 --- a/gastrin/configuration.nix +++ b/gastrin/configuration.nix @@ -39,12 +39,10 @@ enable = true; # Enable the GNOME Desktop Environment. displayManager.gdm.enable = true; - desktopManager.gnome.enable = true; }; # Configure keymap in X11 # Enable CUPS to print documents. - printing.enable = true; # Enable sound with pipewire. pipewire = { enable = true; @@ -60,10 +58,9 @@ }; }; - sound.enable = true; + # sound.enable = true; hardware.pulseaudio.enable = false; security.rtkit.enable = true; - services. # Enable touchpad support (enabled default in most desktopManager). # services.xserver.libinput.enable = true; @@ -116,6 +113,40 @@ # enableSSHSupport = true; # }; programs.sway.enable = true; + virtualisation.docker = { + storageDriver = "overlay2"; + enableOnBoot = true; + enable = true; + autoPrune.enable = true; + # extraOptions = "--userns-remap=default"; + liveRestore = false; # NOTE: Incompatible with swarm + }; + programs = { + + nh = { + enable = true; + clean.enable = true; + clean.extraArgs = "--keep-since 4d --keep 3"; + flake = "/etc/nixos/"; + }; + gnupg.agent = { + enable = true; + enableSSHSupport = true; + }; + + zsh.enable = true; + + neovim = { + enable = true; + configure = { + customRC = '' + set number relativenumber + ''; + }; + + defaultEditor = true; + }; + }; # List services that you want to enable: @@ -126,7 +157,7 @@ # networking.firewall.allowedTCPPorts = [ ... ]; # networking.firewall.allowedUDPPorts = [ ... ]; # Or disable the firewall altogether. - # networking.firewall.enable = false; + networking.firewall.enable = false; # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions diff --git a/gastrin/hardware-configuration.nix b/gastrin/hardware-configuration.nix index 09bbeaa..6f5233d 100644 --- a/gastrin/hardware-configuration.nix +++ b/gastrin/hardware-configuration.nix @@ -38,4 +38,5 @@ nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; + services.smartd.enable = false; }