From e603e7f448a60df740dcfd3a3e769c4cea0163b9 Mon Sep 17 00:00:00 2001 From: Varris Date: Sun, 14 Aug 2022 22:20:39 +0200 Subject: [PATCH] update --- flake.lock | 12 +++++----- flake.nix | 9 ++++--- system/configuration.nix | 52 +++++++++++++++++++++------------------- user/config.nix | 7 ------ user/home.nix | 3 +++ 5 files changed, 43 insertions(+), 40 deletions(-) delete mode 100644 user/config.nix diff --git a/flake.lock b/flake.lock index 38f89cd..cf3d319 100644 --- a/flake.lock +++ b/flake.lock @@ -71,11 +71,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1660435756, - "narHash": "sha256-M2R7f3JvXIyyYyX50YxgasNCnFc0ES8S46eEfv8iIyE=", + "lastModified": 1660464579, + "narHash": "sha256-kzA9rwh0wS6CwUnFHAQ7dhJCowMPfRbvixVeOKnUmjo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4fb60f3177290558355e1cdc2e03b9da449c41ef", + "rev": "b02538b16f6c5e1dbfce1033b27946e25c019b3b", "type": "github" }, "original": { @@ -86,11 +86,11 @@ }, "nur": { "locked": { - "lastModified": 1659947131, - "narHash": "sha256-GHINOuuyKbJJHnOo/HSIU2XafNbp25qnmQ9o7j7S6JI=", + "lastModified": 1660464959, + "narHash": "sha256-7UXkwoQ8WVikjqJYZ6VFjIwTl0ynnzYSsl7Jl+PCtlE=", "owner": "nix-community", "repo": "NUR", - "rev": "06e6a1efa39c6b10c4d21d0d7ae91a815c96f8e0", + "rev": "257d816afd5ae241e2d52b64736dbf77f4131d88", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 25ee0d6..442a587 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,6 @@ inputs = { nixpkgs = { - #url = "nixpkgs/nixos-unstable"; url = "nixpkgs/nixpkgs-unstable"; }; @@ -41,6 +40,7 @@ }; outputs = { self, nixpkgs, home-manager, nur, ... }@inputs: + let username = "manuel"; hostname = "terra"; @@ -49,7 +49,10 @@ pkgs = import nixpkgs { inherit system; - config = { allowUnfree = true; }; + config = { + allowUnfree = true; + allowUnsupportedSystem = true; + }; overlays = [ self.overlays.default nur.overlay ]; }; @@ -65,7 +68,7 @@ }; discord = prev.discord.override { - withOpenASAR = true; + # withOpenASAR = true; }; }); diff --git a/system/configuration.nix b/system/configuration.nix index 57f48a2..ada6e0d 100644 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -33,7 +33,17 @@ time.timeZone = "Europe/Vienna"; # Select internationalisation properties. - i18n.defaultLocale = "en_US.UTF-8"; + i18n = { + defaultLocale = "en_US.UTF-8"; + extraLocaleSettings = { + LC_NUMERIC = "de_AT.UTF-8"; + LC_TIME = "de_AT.UTF-8"; + LC_MONETARY = "de_AT.UTF-8"; + LC_MEASUREMENT = "de_AT.UTF-8"; + LC_IDENTIFICATION = "de_AT.UTF-8"; + }; + }; + console = { font = "Lat2-Terminus16"; keyMap = "us-acentos"; @@ -62,9 +72,6 @@ pulse.enable = true; }; - # Enable touchpad support (enabled default in most desktopManager). - # services.xserver.libinput.enable = true; - security.doas.enable = true; security.sudo.enable = false; @@ -74,13 +81,15 @@ persist = true; }]; + security.polkit.enable = true; + + programs.fish.enable = true; + # Define a user account. Don't forget to set a password with ‘passwd’. users.users.manuel = { isNormalUser = true; - extraGroups = [ "wheel" "audio" "video" "games" "input" "geoclue" ]; # Enable ‘sudo’ for the user. + extraGroups = [ "users" "wheel" "audio" "video" "games" "input" "geoclue" ]; # Enable ‘sudo’ for the user. shell = pkgs.fish; - packages = with pkgs; [ - ]; }; # List packages installed in system profile. To search, run: @@ -93,6 +102,7 @@ htop openrgb ]; + environment.pathsToLink = [ "/share/zsh" ]; # Some programs need SUID wrappers, can be configured further or are # started in user sessions. @@ -114,6 +124,7 @@ }; services.gnome.gnome-keyring.enable = true; + xdg.portal = { enable = true; wlr.enable = true; @@ -126,6 +137,16 @@ enable = true; }; + services.printing = { + enable = true; + drivers = [ pkgs.cnijfilter2 ]; + }; + + services.avahi = { + enable = true; + nssmdns = true; + }; + nix.gc = { persistent = true; automatic = true; @@ -136,23 +157,6 @@ warn-dirty = false ''; - # Open ports in the firewall. - # networking.firewall.allowedTCPPorts = [ ... ]; - # networking.firewall.allowedUDPPorts = [ ... ]; - # Or disable the firewall altogether. - # networking.firewall.enable = false; - - # 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; #broken with flakes - - # 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 = "22.05"; # Did you read the comment? } diff --git a/user/config.nix b/user/config.nix deleted file mode 100644 index 97b4216..0000000 --- a/user/config.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ - packageOverrides = pkgs: { - nur = import (builtins.fetchTarball "https://github.com/nix-community/NUR/archive/master.tar.gz") { - inherit pkgs; - }; - }; -} diff --git a/user/home.nix b/user/home.nix index bf218a5..1e9f89e 100644 --- a/user/home.nix +++ b/user/home.nix @@ -74,6 +74,7 @@ programs.git = { enable = true; + lfs.enable = true; userName = "Varris"; userEmail = "varris@posteo.net"; }; @@ -91,6 +92,8 @@ services.gnome-keyring.enable = true; + programs.aria2.enable = true; + xdg.userDirs = { enable = true; createDirectories = true;