diff --git a/.envrc b/.envrc index 1e30148..e3fecb3 100644 --- a/.envrc +++ b/.envrc @@ -1,5 +1,2 @@ -source_url "https://raw.githubusercontent.com/cachix/devenv/d1f7b48e35e6dee421cfd0f51481d17f77586997/direnvrc" "sha256-YBzqskFZxmNb3kYVoKD9ZixoPXJh1C9ZvTLGFRkauZ0=" +use flake -use devenv - -export PROMPT=""$PROMPT diff --git a/configs/hyprland/mine/hypr/hyprland.d/consts.conf b/configs/hyprland/mine/hypr/hyprland.d/consts.conf index a219328..0f662e8 100644 --- a/configs/hyprland/mine/hypr/hyprland.d/consts.conf +++ b/configs/hyprland/mine/hypr/hyprland.d/consts.conf @@ -1,6 +1,6 @@ $term = alacritty -$browser = brave +$browser = firefox $filemanager = thunar -$editor = nvim +$editor = code $applauncher = wofi --show drun $cmdlauncher = wofi --show run diff --git a/configs/hyprland/mine/hypr/hyprland.d/keybindings.conf b/configs/hyprland/mine/hypr/hyprland.d/keybindings.conf index a46735e..9f36d17 100644 --- a/configs/hyprland/mine/hypr/hyprland.d/keybindings.conf +++ b/configs/hyprland/mine/hypr/hyprland.d/keybindings.conf @@ -2,13 +2,14 @@ $mainMod = SUPER # bind = $mainMod, tab, overview, toggle -# # We've defined $term, $editor and so on in includes.conf. +# Apps. bind = $mainMod, C, exec, $editor bind = $mainMod, space, exec, $applauncher bind = $mainMod, R, exec, $cmdlauncher +bind = $mainMod, T, exec, $term +bind = $mainMod, B, exec, $browser # My Binds -bind = $mainMod, T, exec, $term bind = $mainMod, Q, killactive, bind = ALT, F4, killactive, bind = $mainMod, V, togglefloating, diff --git a/devenv.lock b/devenv.lock deleted file mode 100644 index ad9b769..0000000 --- a/devenv.lock +++ /dev/null @@ -1,122 +0,0 @@ -{ - "nodes": { - "devenv": { - "locked": { - "dir": "src/modules", - "lastModified": 1716370999, - "owner": "cachix", - "repo": "devenv", - "rev": "38bf3509369446cc04410dc7b8f3e6c0e800e282", - "treeHash": "95e7e2cf5c39211e1687c8700841ed3180c4327b", - "type": "github" - }, - "original": { - "dir": "src/modules", - "owner": "cachix", - "repo": "devenv", - "type": "github" - } - }, - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "treeHash": "2addb7b71a20a25ea74feeaf5c2f6a6b30898ecb", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "gitignore": { - "inputs": { - "nixpkgs": [ - "pre-commit-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "treeHash": "ca14199cabdfe1a06a7b1654c76ed49100a689f9", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1716312448, - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "e381a1288138aceda0ac63db32c7be545b446921", - "treeHash": "94e1ec859be23f2ea92ba136657f35237682df6d", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1716218643, - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a8695cbd09a7ecf3376bd62c798b9864d20f86ee", - "treeHash": "7c62ffb1bbf9fc2417d1720663e38db0c3f0b907", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "pre-commit-hooks": { - "inputs": { - "flake-compat": "flake-compat", - "gitignore": "gitignore", - "nixpkgs": [ - "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable" - }, - "locked": { - "lastModified": 1716213921, - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "0e8fcc54b842ad8428c9e705cb5994eaf05c26a0", - "treeHash": "17b9f9f9983467bcff247b09761dca9831d3d3be", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, - "root": { - "inputs": { - "devenv": "devenv", - "nixpkgs": "nixpkgs", - "pre-commit-hooks": "pre-commit-hooks" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/devenv.nix b/devenv.nix deleted file mode 100644 index 5cfc1b1..0000000 --- a/devenv.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ pkgs, ... }: - -{ - languages.nix.enable = true; - packages = [ - pkgs.nixpkgs-fmt - pkgs.nixd - ]; - pre-commit = { - hooks.nixpkgs-fmt.enable = true; - }; -} diff --git a/devenv.yaml b/devenv.yaml deleted file mode 100644 index c7cb5ce..0000000 --- a/devenv.yaml +++ /dev/null @@ -1,3 +0,0 @@ -inputs: - nixpkgs: - url: github:NixOS/nixpkgs/nixpkgs-unstable diff --git a/flake.lock b/flake.lock index f3fef2c..d651a5d 100644 --- a/flake.lock +++ b/flake.lock @@ -71,43 +71,6 @@ "type": "github" } }, - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "gBar": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1722546860, - "narHash": "sha256-27uYkBi5ZJT7w49mkoPWe8zNWl4P6o0JuaY6NRH6cD4=", - "owner": "scorpion-26", - "repo": "gBar", - "rev": "b1e2c2ed26a62058c502db3a03ac615f2567942e", - "type": "github" - }, - "original": { - "owner": "scorpion-26", - "repo": "gBar", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -400,16 +363,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1701040486, - "narHash": "sha256-vawYwoHA5CwvjfqaT3A5CT9V36Eq43gxdwpux32Qkjw=", + "lastModified": 1726320982, + "narHash": "sha256-RuVXUwcYwaUeks6h3OLrEmg14z9aFXdWppTWPMTwdQw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "45827faa2132b8eade424f6bdd48d8828754341a", + "rev": "8f7492cce28977fbf8bd12c72af08b1f6c7c3e49", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } @@ -430,33 +393,16 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1726320982, - "narHash": "sha256-RuVXUwcYwaUeks6h3OLrEmg14z9aFXdWppTWPMTwdQw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "8f7492cce28977fbf8bd12c72af08b1f6c7c3e49", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, "root": { "inputs": { - "gBar": "gBar", "home-manager": "home-manager", "hyprland": "hyprland", "hyprspace": "hyprspace", "nix-darwin": "nix-darwin", "nixos-cosmic": "nixos-cosmic", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_2", - "systems": "systems_2", + "nixpkgs": "nixpkgs", + "systems": "systems", "unstable": "unstable", "unstable-home-manager": "unstable-home-manager" } @@ -497,21 +443,6 @@ "type": "github" } }, - "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ diff --git a/flake.nix b/flake.nix index 1112eff..29626ff 100644 --- a/flake.nix +++ b/flake.nix @@ -30,7 +30,6 @@ url = "github:nix-community/home-manager/master"; inputs.nixpkgs.follows = "unstable"; }; - gBar.url = "github:scorpion-26/gBar"; # Macos nix-darwin = { url = "github:LnL7/nix-darwin"; @@ -47,7 +46,6 @@ , home-manager , unstable-home-manager , nix-darwin - , gBar , hyprland , hyprspace , nixos-cosmic @@ -58,13 +56,6 @@ fullName = "Ari Sosnovsky"; email = "ariel@sosnovsky.ca"; }; - sumoUser = rec { - name = "asosnovsky"; - fullName = user.fullName; - email = "${name}@sumologic.com"; - homepath = "/Users/${name}"; - extraGitConfigs = [{ path = "${homepath}/.config/mysumo/gitconfig"; }]; - }; homeManagerVersion = "24.05"; # Local Services localNixCaches = { @@ -105,7 +96,6 @@ specialArgs = { inputs = { inherit - gBar hyprspace hyprland; }; @@ -137,25 +127,28 @@ ); in { + # Dev Setups + # ------------- + devShells = + lib.eachSystem (system: + let pkgs = nixpkgs.legacyPackages.${system}; + in + { + default = pkgs.mkShell { + name = "nixos-setup"; + packages = with pkgs; [ + nixpkgs-fmt + nixd + ]; + shellHook = '' + export PROMPT=" "$PROMPT + ''; + }; + }); lib = lib; formatter = lib.eachSystem (system: nixpkgs.legacyPackages.${system}.nixpkgs-fmt); - # MacBooks Setups - # ------------- - darwinConfigurations."asosnovsky-mac" = lib.makeDarwinModule { - user = sumoUser // { - enableDevelopmentKit = true; - }; - systemStateVersion = 4; - localNixCaches = localNixCaches; - system = "x86_64-darwin"; - hostName = "asosnovsky-mac"; - homeManagerVersion = homeManagerVersion; - configuration = - (import ./hosts/asosnovsky-mac.nix { user = sumoUser; }); - }; - # None-NIXOS LINUX Setups # ------------- homeConfigurations."${user.name}" = lib.makeHomeManagerUsers { @@ -163,14 +156,8 @@ homeManagerVersion = homeManagerVersion; }; - homeConfigurations."cloaky" = lib.makeHomeManagerUsers { - user = user // { enableDevelopmentKit = true; }; - homeManagerVersion = homeManagerVersion; - modules = [ - hosts/cloaky.nix - ]; - }; - + # NIXOS LINUX Setups + # ------------- nixosConfigurations = { # NIXOS Framework Setups # ------------- diff --git a/hosts/hl-bigbox1.nix b/hosts/hl-bigbox1.nix index 8a14c1b..9029bd5 100644 --- a/hosts/hl-bigbox1.nix +++ b/hosts/hl-bigbox1.nix @@ -22,6 +22,7 @@ # Nvidia Settings services.xserver.videoDrivers = [ "nvidia" ]; services.xserver.enable = true; + services.openssh.settings.X11Forwarding = true; hardware.graphics.enable32Bit = true; hardware.graphics.enable = true; #hardware.opengl.enable = true;