diff --git a/configuration.nix b/configuration.nix index b0968de..78b98c9 100644 --- a/configuration.nix +++ b/configuration.nix @@ -82,7 +82,7 @@ LC_TELEPHONE = "cs_CZ.UTF-8"; LC_TIME = "cs_CZ.UTF-8"; }; - + services.dnsmasq.enable = true; services.displayManager.sddm.enable = true; services.displayManager.sddm.wayland.enable = true; services.desktopManager.plasma6 = { @@ -98,6 +98,7 @@ }; services.printing.enable = true; + hardware.sane.enable = true; hardware.acpilight.enable = true; hardware.pulseaudio.enable = false; security.rtkit.enable = true; @@ -125,7 +126,7 @@ users.users.dan = { isNormalUser = true; description = "John"; - extraGroups = [ "networkmanager" "wheel" "docker" "fuse" "video" "wireshark" "gamemode"]; + extraGroups = [ "networkmanager" "wheel" "docker" "fuse" "video" "wireshark" "gamemode" "scanner" "lp"]; shell = pkgs.fish; packages = with pkgs; [ kdePackages.kate @@ -191,8 +192,11 @@ extraUpFlags = [ "--advertise-exit-node" ]; }; hardware.opentabletdriver.enable = true; - virtualisation.docker.enable = true; - virtualisation.docker.enableOnBoot = false; + virtualisation.docker = { + enable = true; + enableOnBoot = false; + }; + hardware.nvidia-container-toolkit.enable = true; services.avahi.enable = true; boot = { @@ -295,6 +299,16 @@ security.polkit.enable = true; + services.create_ap = { + enable = false; + settings = { + INTERNET_IFACE = "eno1"; + WIFI_IFACE = "wlp4s0"; + SSID = "nixos"; + PASSPHRASE = "12345678"; + }; + }; + # Open ports in the firewall. networking.firewall.allowedTCPPorts = [ 57621 # Spotify app discovery @@ -305,6 +319,7 @@ 5353 # Google cast discovery 42000 # warpinator 42001 # warpinator + 67 68 # dhcp ]; # Or disable the firewall altogether. # networking.firewall.enable = false; diff --git a/flake.lock b/flake.lock index fda3fa9..59f66eb 100644 --- a/flake.lock +++ b/flake.lock @@ -38,11 +38,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1735774679, - "narHash": "sha256-soePLBazJk0qQdDVhdbM98vYdssfs3WFedcq+raipRI=", + "lastModified": 1738453229, + "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f2f7418ce0ab4a5309a4596161d154cfc877af66", + "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd", "type": "github" }, "original": { @@ -58,11 +58,11 @@ ] }, "locked": { - "lastModified": 1735344290, - "narHash": "sha256-oJDtWPH1oJT34RJK1FSWjwX4qcGOBRkcNQPD0EbSfNM=", + "lastModified": 1739757849, + "narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=", "owner": "nix-community", "repo": "home-manager", - "rev": "613691f285dad87694c2ba1c9e6298d04736292d", + "rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe", "type": "github" }, "original": { @@ -145,11 +145,11 @@ ] }, "locked": { - "lastModified": 1735838245, - "narHash": "sha256-dA2s+KFo6+TmYtQoXWfxQ8XukN6JQ0I0VoraG9zD7/I=", + "lastModified": 1738966025, + "narHash": "sha256-MzgrF0jKlTNnNS33D8PwI5z2MJ1Tzf5MQVf/oms2pdw=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "920af33577a889772e96a067130252df5674ca8a", + "rev": "4f48dbe12f3cbbeb4d31c91c67b21edbc5b4b451", "type": "github" }, "original": { @@ -292,15 +292,14 @@ "nix-gaming": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_2", - "umu": "umu" + "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1736041337, - "narHash": "sha256-ImIZdS70uEHLC1NxRfc0bTVhUSBZjDNyaLlUAiloL8g=", + "lastModified": 1740552472, + "narHash": "sha256-KiGmSYyO9MJJqYD7nbQ0NQgsAR2VVY/wRra0Bob4KtE=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "118be90db8e4b06e3829b7b6ea901b610e870040", + "rev": "452fbd6a30f128dddf26c63f727cf685b5af5658", "type": "github" }, "original": { @@ -316,11 +315,11 @@ ] }, "locked": { - "lastModified": 1736047960, - "narHash": "sha256-hutd85FA1jUJhhqBRRJ+u7UHO9oFGD/RVm2x5w8WjVQ=", + "lastModified": 1740281615, + "narHash": "sha256-dZWcbAQ1sF8oVv+zjSKkPVY0ebwENQEkz5vc6muXbKY=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "816a6ae88774ba7e74314830546c29e134e0dffb", + "rev": "465792533d03e6bb9dc849d58ab9d5e31fac9023", "type": "github" }, "original": { @@ -331,11 +330,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1735388221, - "narHash": "sha256-e5IOgjQf0SZcFCEV/gMGrsI0gCJyqOKShBQU0iiM3Kg=", + "lastModified": 1740646007, + "narHash": "sha256-dMReDQobS3kqoiUCQIYI9c0imPXRZnBubX20yX/G5LE=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "7c674c6734f61157e321db595dbfcd8523e04e19", + "rev": "009b764ac98a3602d41fc68072eeec5d24fc0e49", "type": "github" }, "original": { @@ -362,23 +361,23 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1735774519, - "narHash": "sha256-CewEm1o2eVAnoqb6Ml+Qi9Gg/EfNAxbRx1lANGVyoLI=", + "lastModified": 1738452942, + "narHash": "sha256-vJzFZGaCpnmo7I6i416HaBLpC+hvcURh/BQwROcGIp8=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz" } }, "nixpkgs-unstable": { "locked": { - "lastModified": 1735834308, - "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=", + "lastModified": 1740560979, + "narHash": "sha256-Vr3Qi346M+8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6df24922a1400241dae323af55f30e4318a6ca65", + "rev": "5135c59491985879812717f4c9fea69604e7f26f", "type": "github" }, "original": { @@ -390,11 +389,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1735915915, - "narHash": "sha256-Q4HuFAvoKAIiTRZTUxJ0ZXeTC7lLfC9/dggGHNXNlCw=", + "lastModified": 1740019556, + "narHash": "sha256-vn285HxnnlHLWnv59Og7muqECNMS33mWLM14soFIv2g=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a27871180d30ebee8aa6b11bf7fef8a52f024733", + "rev": "dad564433178067be1fbdfcce23b546254b6d641", "type": "github" }, "original": { @@ -406,11 +405,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1735922141, - "narHash": "sha256-vk0xwGZSlvZ/596yxOtsk4gxsIx2VemzdjiU8zhjgWw=", + "lastModified": 1740603184, + "narHash": "sha256-t+VaahjQAWyA+Ctn2idyo1yxRIYpaDxMgHkgCNiMJa4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d29ab98cd4a70a387b8ceea3e930b3340d41ac5a", + "rev": "f44bd8ca21e026135061a0a57dcf3d0775b67a49", "type": "github" }, "original": { @@ -501,31 +500,6 @@ "type": "github" } }, - "umu": { - "inputs": { - "nixpkgs": [ - "nix-gaming", - "nixpkgs" - ] - }, - "locked": { - "dir": "packaging/nix", - "lastModified": 1735507919, - "narHash": "sha256-4cR4mk1660p3y8wnX0XbHSQh4KX0mbMn6/2YnALNt8o=", - "ref": "refs/heads/main", - "rev": "59a82ea8cd284c7535bc06b8f6156abb7da96f6a", - "revCount": 874, - "submodules": true, - "type": "git", - "url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix" - }, - "original": { - "dir": "packaging/nix", - "submodules": true, - "type": "git", - "url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix" - } - }, "xdph": { "inputs": { "hyprland-protocols": "hyprland-protocols_2", diff --git a/home.nix b/home.nix index b31b014..9843563 100644 --- a/home.nix +++ b/home.nix @@ -12,8 +12,12 @@ in stateVersion = "24.05"; packages = with pkgs; [ + xournalpp + simple-scan + dotnet-sdk # acpilight #kdePackages.plasma-workspace + godot_4 rar wootility surrealdb @@ -166,6 +170,7 @@ in python312Packages.pypykatz screen openvpn + ghostty mdbook nix-tree @@ -258,6 +263,7 @@ in }; extraConfig = { pull.rebase = false; + pull.ff = "only"; gpg.format = "ssh"; commit.gpgsign = true; gpg.ssh.allowedSignersFile = "/home/dan/allowed_signers"; diff --git a/remove-old-nix.sh b/remove-old-nix.sh index 6f01430..8f067ff 100644 --- a/remove-old-nix.sh +++ b/remove-old-nix.sh @@ -1,4 +1,4 @@ # sudo nix profile wipe-history --profile /nix/var/nix/profiles/system --older-than 30d # nix-env --delete-generations 30d # nix-collect-garbage -nh clean all -k 4 -K 10d +nh clean all -k 2 -K 10d