diff --git a/flake.lock b/flake.lock index 4f172a0..32ecd43 100644 --- a/flake.lock +++ b/flake.lock @@ -304,14 +304,18 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1728249206, - "narHash": "sha256-p/ntQwqm0zA/HnitCL8UrzMuC8mjUDr7LEu/f3XiWsU=", - "path": "/home/tristan/Documents/code/home-manager/cosmic", - "type": "path" + "lastModified": 1728250817, + "narHash": "sha256-OVHpUlNxHpQUe2Waav/MR+Z7fm6ft/w8SxWlvXv+AdU=", + "owner": "tristanbeedell", + "repo": "home-manager", + "rev": "ce770a3e442b2105852a6f5f79f3645b4c64505c", + "type": "github" }, "original": { - "path": "/home/tristan/Documents/code/home-manager/cosmic", - "type": "path" + "owner": "tristanbeedell", + "ref": "cosmic", + "repo": "home-manager", + "type": "github" } }, "home-manager_2": { diff --git a/flake.nix b/flake.nix index 15e81b5..b81f9ac 100644 --- a/flake.nix +++ b/flake.nix @@ -6,7 +6,7 @@ url = "github:nix-community/home-manager/master"; inputs.nixpkgs.follows = "nixpkgs"; }; - home-manager-cosmic.url = "path:///home/tristan/Documents/code/home-manager/cosmic"; + home-manager-cosmic.url = "github:tristanbeedell/home-manager/cosmic"; stylix.url = "github:danth/stylix"; sops-nix.url = "github:Mic92/sops-nix"; nixos-cosmic = { diff --git a/hardware/zenix.nix b/hardware/zenix.nix index 8e7dde2..3a3cd19 100644 --- a/hardware/zenix.nix +++ b/hardware/zenix.nix @@ -29,7 +29,7 @@ in { device = "/dev/disk/by-label/nix"; fsType = "f2fs"; neededForBoot = true; - options = [ "noatime" ]; + options = ["noatime"]; }; boot.initrd.postDeviceCommands = pkgs.lib.mkBefore (decrypt { diff --git a/home/desktop/cosmic/default.nix b/home/desktop/cosmic/default.nix index f8c0282..6a12893 100644 --- a/home/desktop/cosmic/default.nix +++ b/home/desktop/cosmic/default.nix @@ -1,40 +1,44 @@ -{pkgs, config, ...}: let +{ + pkgs, + config, + ... +}: let inherit (config.lib.cosmic) Actions; in { programs.cosmic = { enable = true; input.asDefaults = true; input.binds = { -# Navigation - Super. "h" = (Actions.Focus "Left"); - Super. "l" = (Actions.Focus "Right"); - Super. "j" = (Actions.Focus "Down"); - Super. "k" = (Actions.Focus "Up"); - Super.Shift. "h" = (Actions.Move "Left"); - Super.Shift. "l" = (Actions.Move "Right"); - Super.Shift. "j" = (Actions.Move "Down"); - Super.Shift. "k" = (Actions.Move "Up"); - Super. "1" = (Actions.Workspace 1); - Super. "2" = (Actions.Workspace 2); - Super. "3" = (Actions.Workspace 3); - Super. "4" = (Actions.Workspace 4); - Super. "5" = (Actions.Workspace 5); - Super.Shift. "1" = (Actions.MoveToWorkspace 1); - Super.Shift. "2" = (Actions.MoveToWorkspace 2); - Super.Shift. "3" = (Actions.MoveToWorkspace 3); - Super.Shift. "4" = (Actions.MoveToWorkspace 4); - Super.Shift. "5" = (Actions.MoveToWorkspace 5); + # Navigation + Super. "h" = Actions.Focus "Left"; + Super. "l" = Actions.Focus "Right"; + Super. "j" = Actions.Focus "Down"; + Super. "k" = Actions.Focus "Up"; + Super.Shift. "h" = Actions.Move "Left"; + Super.Shift. "l" = Actions.Move "Right"; + Super.Shift. "j" = Actions.Move "Down"; + Super.Shift. "k" = Actions.Move "Up"; + Super. "1" = Actions.Workspace 1; + Super. "2" = Actions.Workspace 2; + Super. "3" = Actions.Workspace 3; + Super. "4" = Actions.Workspace 4; + Super. "5" = Actions.Workspace 5; + Super.Shift. "1" = Actions.MoveToWorkspace 1; + Super.Shift. "2" = Actions.MoveToWorkspace 2; + Super.Shift. "3" = Actions.MoveToWorkspace 3; + Super.Shift. "4" = Actions.MoveToWorkspace 4; + Super.Shift. "5" = Actions.MoveToWorkspace 5; Super. "Space" = Actions.ToggleWindowFloating; Super. "f" = Actions.Maximize; Super. "m" = Actions.Minimize; Super.Shift. "x" = Actions.Close; Super.Shift. "v" = Actions.ToggleStacking; Super.Shift. "y" = Actions.ToggleSticky; -# System - Super. "d" = (Actions.Spawn config.programs.menu.drunCommand); - Super. "Return" = (Actions.Spawn pkgs.alacritty); - Super. "o" = (Actions.System "HomeFolder"); - Super.Shift. "s" = (Actions.System "Screenshot"); + # System + Super. "d" = Actions.Spawn config.programs.menu.drunCommand; + Super. "Return" = Actions.Spawn pkgs.alacritty; + Super. "o" = Actions.System "HomeFolder"; + Super.Shift. "s" = Actions.System "Screenshot"; }; background = { displays = { @@ -46,8 +50,10 @@ in { panels = { "Bar" = { applets = { - start = [ "com.system76.CosmicAppletWorkspaces" ]; - center = [ "com.system76.CosmicAppList" ]; + start = [ + "com.system76.CosmicAppletWorkspaces" + ]; + center = []; end = [ "com.system76.CosmicAppletTime" "com.system76.CosmicAppletTiling" diff --git a/home/programs/graphical.nix b/home/programs/graphical.nix index c6ef988..6c5050f 100644 --- a/home/programs/graphical.nix +++ b/home/programs/graphical.nix @@ -13,7 +13,6 @@ helvum # tools - obs-studio inkscape libsForQt5.okular gimp @@ -31,6 +30,11 @@ bitwarden ]; + programs.obs-studio = { + enable = true; + plugins = [pkgs.obs-studio-plugins.wlrobs]; + }; + xdg.mimeApps.defaultApplications = { "application/pdf" = "sioyek.desktop"; }; diff --git a/nixos/programs/cosmic.nix b/nixos/programs/cosmic.nix index b5cbed6..8028081 100644 --- a/nixos/programs/cosmic.nix +++ b/nixos/programs/cosmic.nix @@ -1,4 +1,8 @@ -{inputs, config, ...}: { +{ + inputs, + config, + ... +}: { imports = [ inputs.nixos-cosmic.nixosModules.default ];