diff --git a/home/dot_config/lazygit/empty_config.yml b/home/dot_config/lazygit/empty_config.yml index e69de29..f3575a2 100644 --- a/home/dot_config/lazygit/empty_config.yml +++ b/home/dot_config/lazygit/empty_config.yml @@ -0,0 +1,3 @@ +git: + paging: + - pager: delta --dark --paging=never diff --git a/home/dot_config/nix-config/flake.lock b/home/dot_config/nix-config/flake.lock deleted file mode 100644 index 3690b21..0000000 --- a/home/dot_config/nix-config/flake.lock +++ /dev/null @@ -1,49 +0,0 @@ -{ - "nodes": { - "nix-darwin": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1751313918, - "narHash": "sha256-HsJM3XLa43WpG+665aGEh8iS8AfEwOIQWk3Mke3e7nk=", - "owner": "nix-darwin", - "repo": "nix-darwin", - "rev": "e04a388232d9a6ba56967ce5b53a8a6f713cdfcf", - "type": "github" - }, - "original": { - "owner": "nix-darwin", - "ref": "master", - "repo": "nix-darwin", - "type": "github" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1753934836, - "narHash": "sha256-G06FmIBj0I5bMW1Q8hAEIl5N7IHMK7+Ta4KA+BmneDA=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "8679b16e11becd487b45d568358ddf9d5640d860", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "root": { - "inputs": { - "nix-darwin": "nix-darwin", - "nixpkgs": "nixpkgs" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/home/dot_config/nix-config/flake.nix b/home/dot_config/nix-config/flake.nix deleted file mode 100644 index 8029369..0000000 --- a/home/dot_config/nix-config/flake.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ - description = "My macOS Flake config"; - - inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; - nix-darwin.url = "github:nix-darwin/nix-darwin/master"; - nix-darwin.inputs.nixpkgs.follows = "nixpkgs"; - }; - - outputs = { self, nixpkgs, nix-darwin, ... }: { - darwinConfigurations."zen" = nix-darwin.lib.darwinSystem { - system = "aarch64-darwin"; - modules = [ - ./hosts/macbook/default.nix - ./hosts/macbook/brew.nix - ./hosts/macbook/system.nix - ]; - }; - - }; -} diff --git a/home/dot_config/powershell/xaa b/home/dot_config/powershell/xaa deleted file mode 100644 index 67fbfd1..0000000 --- a/home/dot_config/powershell/xaa +++ /dev/null @@ -1 +0,0 @@ -/home/js0ny/.local/share/powershell/Modules:/usr/local/share/powershell/Modules:/opt/microsoft/powershell/7/Modules diff --git a/nixcfgs/modules/nixos/core/configuration.nix b/nixcfgs/modules/nixos/core/configuration.nix index ae76b25..f3fb193 100644 --- a/nixcfgs/modules/nixos/core/configuration.nix +++ b/nixcfgs/modules/nixos/core/configuration.nix @@ -30,9 +30,6 @@ isNormalUser = true; extraGroups = [ "wheel" - "docker" - "libvirtd" - "dialout" ]; # Enable ‘sudo’ for the user. openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJToUo2jT3qt7eHIME9e1awabZZVmtKhbxwVz9BMSM2d js0ny@zephyrus" diff --git a/nixcfgs/modules/nixos/desktop/de/kde.nix b/nixcfgs/modules/nixos/desktop/de/kde.nix index d78ccc0..233c652 100644 --- a/nixcfgs/modules/nixos/desktop/de/kde.nix +++ b/nixcfgs/modules/nixos/desktop/de/kde.nix @@ -5,5 +5,4 @@ korganizer kdepim-addons ]; - services.xserver.desktopManager.cinnamon.enable = true; } diff --git a/nixcfgs/modules/nixos/hardware/udev/basys3.nix b/nixcfgs/modules/nixos/hardware/udev/basys3.nix index a6eabd1..118cd58 100644 --- a/nixcfgs/modules/nixos/hardware/udev/basys3.nix +++ b/nixcfgs/modules/nixos/hardware/udev/basys3.nix @@ -1,6 +1,9 @@ -{...}: { +{config, ...}: { # Xilinx Artix-7 Basys 3 services.udev.extraRules = '' ATTRS{idVendor}=="0403", ATTRS{idProduct}=="6010", MODE="0660", GROUP="dialout", SYMLINK+="basys3" ''; + users.users.${config.var.username} = { + extraGroups = ["dialout"]; + }; } diff --git a/nixcfgs/modules/nixos/programs/libvirt.nix b/nixcfgs/modules/nixos/programs/libvirt.nix index e4650fa..f66fc27 100644 --- a/nixcfgs/modules/nixos/programs/libvirt.nix +++ b/nixcfgs/modules/nixos/programs/libvirt.nix @@ -1,4 +1,8 @@ -{pkgs, ...}: { +{ + pkgs, + config, + ... +}: { environment.systemPackages = with pkgs; [ virt-manager dnsmasq @@ -13,7 +17,7 @@ swtpm.enable = true; }; }; - users.users.js0ny = { + users.users.${config.var.username} = { extraGroups = ["libvirtd"]; }; networking.firewall.trustedInterfaces = ["virbr0"]; diff --git a/nixcfgs/modules/nixos/services/docker.nix b/nixcfgs/modules/nixos/services/docker.nix index 38adcb4..144d98c 100644 --- a/nixcfgs/modules/nixos/services/docker.nix +++ b/nixcfgs/modules/nixos/services/docker.nix @@ -1,8 +1,11 @@ -{pkgs, ...}: { +{config, ...}: { virtualisation = { docker.enable = true; podman.enable = true; }; + users.users.${config.var.username} = { + extraGroups = ["docker" "podman"]; + }; # systemd.services.docker = { # serviceConfig = {