diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | flake.nix | 29 | ||||
| -rw-r--r-- | hosts/local/i3.nix | 2 | ||||
| -rw-r--r-- | hosts/local/master/configuration.nix | 12 | ||||
| -rw-r--r-- | hosts/local/master/keyboard.nix | 2 | ||||
| -rw-r--r-- | hosts/pkgs.nix | 13 |
6 files changed, 36 insertions, 23 deletions
@@ -10,3 +10,4 @@ devenv.local.nix # pre-commit .pre-commit-config.yaml # flake.lock +data.ms @@ -37,20 +37,20 @@ url = "github:sodiboo/niri-flake"; inputs.nixpkgs.follows = "nixpkgs"; }; - dgop = { - url = "github:AvengeMedia/dgop"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - dms-cli = { - url = "github:AvengeMedia/danklinux"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - dankMaterialShell = { - url = "github:AvengeMedia/DankMaterialShell"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.dgop.follows = "dgop"; - inputs.dms-cli.follows = "dms-cli"; - }; + # dgop = { + # url = "github:AvengeMedia/dgop"; + # inputs.nixpkgs.follows = "nixpkgs"; + # }; + # dms-cli = { + # url = "github:AvengeMedia/danklinux"; + # inputs.nixpkgs.follows = "nixpkgs"; + # }; + # dankMaterialShell = { + # url = "github:AvengeMedia/DankMaterialShell"; + # inputs.nixpkgs.follows = "nixpkgs"; + # inputs.dgop.follows = "dgop"; + # inputs.dms-cli.follows = "dms-cli"; + # }; # claude-desktop = { # url = "git:file:/home/y/code/nix/claude-desktop-linux-flake"; # inputs.nixpkgs.follows = "nixpkgs"; @@ -143,6 +143,7 @@ url = "github:openai/codex"; inputs.nixpkgs.follows = "nixpkgs"; }; + nix-alien.url = "github:thiagokokada/nix-alien"; # quickshell = { # # remove ?ref=v0.1.0 to track the master branch diff --git a/hosts/local/i3.nix b/hosts/local/i3.nix index 8b8fda2..9c68af3 100644 --- a/hosts/local/i3.nix +++ b/hosts/local/i3.nix @@ -47,8 +47,6 @@ in { vSync = true; }; environment.systemPackages = with pkgs; [ - # old-pkgs.vivaldi - vivaldi #notifications dunst polybar diff --git a/hosts/local/master/configuration.nix b/hosts/local/master/configuration.nix index bf905e8..e57acb9 100644 --- a/hosts/local/master/configuration.nix +++ b/hosts/local/master/configuration.nix @@ -11,10 +11,10 @@ in { # Include the results of the hardware scan. ../../base.nix ../../linux.nix - # ../../unfree.nix + ../../unfree.nix #../../android.nix - # ../gui.nix - # ../i3.nix + ../gui.nix + ../i3.nix # ../gnome.nix # ../wayland.nix ../nvidia.nix @@ -50,9 +50,9 @@ in { services.tailscale = { enable = true; }; - #services.meilisearch = { - # enable = true; - #}; + services.meilisearch = { + enable = true; + }; zramSwap = { enable = true; diff --git a/hosts/local/master/keyboard.nix b/hosts/local/master/keyboard.nix index 5e2e241..8fae8c2 100644 --- a/hosts/local/master/keyboard.nix +++ b/hosts/local/master/keyboard.nix @@ -15,7 +15,7 @@ config = builtins.readFile ./thinkpad.kbd; }; wiredThinkpad = { - device = "/dev/input/by-id/usb-Lenovo_ThinkPad_Compact_usb_Keyboard_with_TrackPoint-event-kbd"; + device = "/dev/input/by-id/usb-Lenovo_ThinkPad_Compact_USB_Keyboard_with_TrackPoint-event-kbd"; config = builtins.readFile ./thinkpad.kbd; }; }; diff --git a/hosts/pkgs.nix b/hosts/pkgs.nix index f496128..37a0bae 100644 --- a/hosts/pkgs.nix +++ b/hosts/pkgs.nix @@ -58,11 +58,23 @@ # images imagemagick + zsh # nix #nixfmt direnv nix-direnv devenv + nix-tree + nix-output-monitor + nix-index + nix-du + nix-diff + nurl + statix + manix + inputs.nix-alien.packages.${pkgs.system}.nix-alien + + # # inputs.devenv.packages.${pkgs.system}.default cachix devbox @@ -82,6 +94,7 @@ ast-grep diffsitter # + lmstudio ] ++ lib.optionals pkgs.stdenv.isLinux [ # linuxKernel.packages.linux_latest_libre.cpupower |