Merge branch 'master' of https://github.com/johron/nix-dots

flake.lock

@@ -8,11 +8,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1782447389,
-        "narHash": "sha256-r0jDyVCZQNymth2VMpALg/JPD3whSAupCmvvpHNDsIY=",
+        "lastModified": 1781930126,
+        "narHash": "sha256-AopjjM6497f3Usb6IAZgensjtzGlYGGpJLw7DRtP67I=",
         "owner": "caelestia-dots",
         "repo": "cli",
-        "rev": "7c896367d72cf50db6bf93a1f47873f5259d9146",
+        "rev": "b00dabaa9351d1383dfba162f5b3575b49a126e1",
         "type": "github"
       },
       "original": {
@@ -58,11 +58,11 @@
         "quickshell": "quickshell"
       },
       "locked": {
-        "lastModified": 1782375516,
-        "narHash": "sha256-6pX6OFMScAonhT0VW8TMfxTFjdwADA8Jey+aJut8tY4=",
+        "lastModified": 1781850732,
+        "narHash": "sha256-YKAWz4bSguUWwc1GxOHXRFl4fT+t9WnA2VoZGIRdFVc=",
         "owner": "caelestia-dots",
         "repo": "shell",
-        "rev": "3bbf9f8d33a13dd56d8242d7d864472ba4ea9185",
+        "rev": "37e603fbf6f973a09f451553b61ac584d9877cf1",
         "type": "github"
       },
       "original": {
@@ -81,11 +81,11 @@
         "quickshell": "quickshell_2"
       },
       "locked": {
-        "lastModified": 1782499598,
-        "narHash": "sha256-WrpwsIpM836FEZrsiQ3OAnvSYT/9Oq0Luicil5rHSOw=",
+        "lastModified": 1781850732,
+        "narHash": "sha256-YKAWz4bSguUWwc1GxOHXRFl4fT+t9WnA2VoZGIRdFVc=",
         "owner": "caelestia-dots",
         "repo": "shell",
-        "rev": "90a1b4662f6786e6091ee0b29c7b1431e2ff0bf6",
+        "rev": "37e603fbf6f973a09f451553b61ac584d9877cf1",
         "type": "github"
       },
       "original": {
@@ -94,21 +94,6 @@
         "type": "github"
       }
     },
-    "crane": {
-      "locked": {
-        "lastModified": 1780099841,
-        "narHash": "sha256-EVZd2RsbpreRUDSi9rBwPY+ZxoyMaiEBbZxxhljbaS4=",
-        "owner": "ipetkov",
-        "repo": "crane",
-        "rev": "0532eb17955225173906d671fb36306bdeb1e2dc",
-        "type": "github"
-      },
-      "original": {
-        "owner": "ipetkov",
-        "repo": "crane",
-        "type": "github"
-      }
-    },
     "dms": {
       "inputs": {
         "nixpkgs": [
@@ -131,24 +116,6 @@
         "type": "github"
       }
     },
-    "flake-utils": {
-      "inputs": {
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -213,11 +180,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1782050081,
-        "narHash": "sha256-IECdIJo2xBGHRlVw3/fkz1MgXHh8jK97j55fDaRloxY=",
+        "lastModified": 1781014746,
+        "narHash": "sha256-Fvk4kHgYNY7rZWrH3Kq8J15myb0uOC5pLbwthu4yLos=",
         "owner": "johron",
         "repo": "moose",
-        "rev": "81174bdf4dcf69690a62e60636d9e61a5715c74e",
+        "rev": "e504289df0c1ba94e3486e6b84f42d9dd89e0dc1",
         "type": "github"
       },
       "original": {
@@ -286,7 +253,7 @@
           "noctalia",
           "nixpkgs"
         ],
-        "systems": "systems_2",
+        "systems": "systems",
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
@@ -374,28 +341,12 @@
         "caelestia-shell": "caelestia-shell_2",
         "dms": "dms",
         "home-manager": "home-manager",
-        "moose": "moose",
         "nix-flatpak": "nix-flatpak",
         "nixpkgs": "nixpkgs",
         "noctalia": "noctalia"
       }
     },
     "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "systems_2": {
       "locked": {
         "lastModified": 1689347949,
         "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",

flake.nix

@@ -8,10 +8,10 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.7.0";
-    moose = {
-      url = "github:johron/moose";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
+    #moose = {
+    #  url = "github:johron/moose";
+    #  inputs.nixpkgs.follows = "nixpkgs";
+    #};
 
     caelestia-shell = {
       #url = "github:anarion80/caelestia-shell/topbar";

home/features/application/bashrc.nix

@@ -26,7 +26,7 @@ home = {
             sudo flatpak update -y
             cd "$ORIG_CWD"
           }
-          jclone() {
+          jc() {
             git clone https://github.com/johron/$1
           }
         '';

home/features/desktop/sway/sway.nix

@@ -72,7 +72,7 @@ in
         "${mod}+Shift+q" = "kill";
         "${mod}+d" = "exec wofi";
         "${mod}+Return" = "exec alacritty";
-        "${mod}+Shift+Return" = "exec alacritty -e bash -c 'moose; exec bash'";
+        #"${mod}+Shift+Return" = "exec alacritty -e bash -c 'moose; exec bash'";
         "${super}+l" = "exec swaylock";
         "${mod}+r" = "mode \"resize\"";
 

hosts/nixstation/configuration.nix

@@ -28,4 +28,10 @@ in
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
   system.stateVersion = "26.05";
+
+  nixpkgs.overlays = [
+    (final: prev: {
+      openblas = prev.openblas.overrideAttrs (old: { doCheck = false; });
+    })
+  ];
 }

nixos/features/system/basic.nix

@@ -2,7 +2,7 @@
 
 {
   environment.systemPackages = let
-    moose = inputs.moose.packages.${pkgs.system}.default;
+    #moose = inputs.moose.packages.${pkgs.system}.default;
   in 
   with pkgs; [
     lf
@@ -29,6 +29,7 @@
     kdePackages.qt6ct
     lxqt.lxqt-policykit
     neovim
+    emacs
     google-fonts
     ffmpeg_7-full
     libGL
@@ -39,8 +40,9 @@
     dgop
     cava
     powertop
+    joplin-desktop
 
-    moose
+    #moose
   ];
 
   services.flatpak = {
@@ -79,7 +81,7 @@
 
   environment.variables = {
     QT_QPA_PLATFORMTHEME = "qt6ct";
-    EDITOR = "moose";
+    EDITOR = "nvim";
   };
 
   services.xserver.xkb = {
@@ -114,7 +116,7 @@
   services.power-profiles-daemon.enable = true;
 
   services.accounts-daemon.enable = true;
-  
+
   services.dbus = {
     enable = true;
     packages = with pkgs; [ cups-pk-helper ];

nixos/flavors/desktop/hyprland/default.nix

@@ -14,11 +14,8 @@
     geoclue2
     wtype
     matugen
-
     alacritty
 
-    hyprlauncher
-
     kdePackages.dolphin
     kdePackages.qtsvg 
     kdePackages.kio

nixos/hardware/networking/default.nix

@@ -1,7 +1,12 @@
 { config, pkgs, ... }:
 {
   networking = {
-    networkmanager.enable = true;
+    nameservers = [ "1.1.1.1" "1.0.0.1" ];
+
+    networkmanager = {
+      enable = true;
+      dns = "none";
+    };
     firewall = {
       checkReversePath = false;
       allowedUDPPortRanges = [