diff --git a/flake.lock b/flake.lock index 026db9a..b2104b4 100644 --- a/flake.lock +++ b/flake.lock @@ -24,11 +24,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1721306136, - "narHash": "sha256-VKPsIGf3/a+RONBipx4lEE4LXG2sdMNkWQu22LNQItg=", + "lastModified": 1725841979, + "narHash": "sha256-SXYqzpHPuXFR6w/cUKo3VN8XRn6XA2mGbdRXs9oLk6k=", "owner": "Aylur", "repo": "ags", - "rev": "344ea72cd3b8d4911f362fec34bce7d8fb37028c", + "rev": "aaef50bb2c80ef4b4a359329d72669a95e7c4796", "type": "github" }, "original": { @@ -197,11 +197,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1725614258, - "narHash": "sha256-QhrhRVdcpCxz22rGXjjvuKij3PjMFN/DMlSIKZk9eaM=", + "lastModified": 1726046165, + "narHash": "sha256-ZppVrHiVnntCJsyjdfxEJKj8WAMrhQONj2iekFnMhpU=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "5d87c6391f09134b214a85eb3b28ecbebbad7269", + "rev": "12e602219fc2ca3ca0f9a0fc9a7701853b7e3998", "type": "github" }, "original": { @@ -436,11 +436,11 @@ ] }, "locked": { - "lastModified": 1725628988, - "narHash": "sha256-Y6TBMTGu4bddUwszGjlcOuN0soVc1Gv43hp+1sT/GNI=", + "lastModified": 1726036828, + "narHash": "sha256-ZQHbpyti0jcAKnwQY1lwmooecLmSG6wX1JakQ/eZNeM=", "owner": "nix-community", "repo": "home-manager", - "rev": "127ccc3eb7e36fa75e8c3fbd8a343154f66cc1c6", + "rev": "8a1671642826633586d12ac3158e463c7a50a112", "type": "github" }, "original": { @@ -533,11 +533,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1725477728, - "narHash": "sha256-ahej1VRqKmWbG7gewty+GlrSBEeGY/J2Zy8Nt8+3fdg=", + "lastModified": 1725885300, + "narHash": "sha256-5RLEnou1/GJQl+Wd+Bxaj7QY7FFQ9wjnFq1VNEaxTmc=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "880be1ab837e1e9fe0449dae41ac4d034694d4ce", + "rev": "166dee4f88a7e3ba1b7a243edb1aca822f00680e", "type": "github" }, "original": { @@ -576,11 +576,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1725407940, - "narHash": "sha256-tiN5Rlg/jiY0tyky+soJZoRzLKbPyIdlQ77xVgREDNM=", + "lastModified": 1725826545, + "narHash": "sha256-L64N1rpLlXdc94H+F6scnrbuEu+utC03cDDVvvJGOME=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6f6c45b5134a8ee2e465164811e451dcb5ad86e3", + "rev": "f4c846aee8e1e29062aa8514d5e0ab270f4ec2f9", "type": "github" }, "original": { @@ -656,11 +656,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1725432240, - "narHash": "sha256-+yj+xgsfZaErbfYM3T+QvEE2hU7UuE+Jf0fJCJ8uPS0=", + "lastModified": 1725983898, + "narHash": "sha256-4b3A9zPpxAxLnkF9MawJNHDtOOl6ruL0r6Og1TEDGCE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ad416d066ca1222956472ab7d0555a6946746a80", + "rev": "1355a0cbfeac61d785b7183c0caaec1f97361b43", "type": "github" }, "original": { @@ -709,11 +709,11 @@ ] }, "locked": { - "lastModified": 1725575977, - "narHash": "sha256-1e9zB0dMRwdAbhxVATlL25rExMDh4gZ/3AXdkpU8408=", + "lastModified": 1725914634, + "narHash": "sha256-U74hu15xSb6JNySMOwyJrsh4uk1DVa182bdHLeHdYMc=", "owner": "nix-community", "repo": "plasma-manager", - "rev": "b82b9ba85c156a5e7f865cc94ed2a4df20cbbf39", + "rev": "60becd0e994e25b372c8d0500fc944396f6c1085", "type": "github" }, "original": { @@ -832,11 +832,11 @@ ] }, "locked": { - "lastModified": 1725589472, - "narHash": "sha256-+OB00N6Yql/ZRQQkQ0PNnxfW2tH89DHnv29hBS7tXMM=", + "lastModified": 1726021481, + "narHash": "sha256-4J4E+Fh+77XIYnq2RVtg+ENWXpu6t74P0jKN/f2RQmI=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "2b00881d2ff72174cffdc007238cb6bedd6e1d8e", + "rev": "1c2c120246c51a644c20ba2a36a33d3bd4860d70", "type": "github" }, "original": { diff --git a/modules/desktop.nix b/modules/desktop.nix index 478eaba..3a37482 100644 --- a/modules/desktop.nix +++ b/modules/desktop.nix @@ -266,19 +266,16 @@ with lib; services.samba-wsdd.enable = true; services.samba = { enable = true; - extraConfig = '' - workgroup = WORKGROUP - server string = smbnix - netbios name = smbnix - security = user - #use sendfile = yes - #max protocol = smb2 - # note: localhost is the ipv6 localhost ::1 - hosts allow = 192.168.0. 127.0.0.1 localhost - hosts deny = 0.0.0.0/0 - guest account = nobody - map to guest = bad user - ''; + # settings = { + # workgroup = "WORKGROUP"; + # "server string" = "smbnix"; + # "netbios name" = "smbnix"; + # security = "user"; + # "hosts allow" = ["192.168.0." "127.0.0.1" "localhost"]; + # "hosts deny" = "0.0.0.0/0"; + # "guest account" = "nobody"; + # "map to guest" = "bad user"; + # }; shares = { public = { path = "/home/chris"; diff --git a/modules/emacs.nix b/modules/emacs.nix index ed828ed..7807718 100644 --- a/modules/emacs.nix +++ b/modules/emacs.nix @@ -101,8 +101,9 @@ with lib; nano-agenda yasnippet wgrep - melpaPackages.tempel - melpaPackages.tempel-collection + tempel + tempel-collection + eglot-tempel projectile simple-httpd avy diff --git a/pkgs/desktop-packages.nix b/pkgs/desktop-packages.nix index 106fb1f..2d5f8d1 100644 --- a/pkgs/desktop-packages.nix +++ b/pkgs/desktop-packages.nix @@ -20,8 +20,8 @@ with lib; dash dolphin # guix - freecad - picard + # freecad + # picard brightnessctl mpc-cli dunst @@ -58,7 +58,7 @@ with lib; libnotify rofi-wayland wf-recorder - wofi + # wofi waybar tridactyl-native eww @@ -91,7 +91,7 @@ with lib; darktable virt-manager virt-viewer - kdialog + # kdialog # kdePackages.khotkeys inkscape libreoffice-fresh @@ -117,7 +117,7 @@ with lib; # olive-editor # davinci-resolve # natron - glaxnimate + # glaxnimate mediainfo libmediainfo pqiv diff --git a/systems/kaladin/configuration.nix b/systems/kaladin/configuration.nix index 5ddcc90..e759622 100644 --- a/systems/kaladin/configuration.nix +++ b/systems/kaladin/configuration.nix @@ -67,7 +67,10 @@ # List services that you want to enable: # Enable the OpenSSH daemon. - services.openssh.enable = true; + services.openssh = { + enable = true; + startWhenNeeded = true; + }; # services.caddy = {