Compare commits

..

No commits in common. "9fffce71cdb79690e2efac03ed6a38b74f1a7724" and "b79c776d974c48d7919ecf965e7230b139ca771c" have entirely different histories.

3 changed files with 30 additions and 10 deletions

View file

@ -16,11 +16,35 @@ in
"${nixos-cosmic}/nixos/cosmic/module.nix" "${nixos-cosmic}/nixos/cosmic/module.nix"
]; ];
config = { config = {
services.desktopManager.cosmic.enable = true; services.xserver.desktopManager.cosmic.enable = true;
nixpkgs.overlays = [ cosmicPkgsOverlay ]; nixpkgs.overlays = [ cosmicPkgsOverlay ];
nix.settings = { nix.settings = {
substituters = [ "https://cosmic.cachix.org/" ]; substituters = [ "https://cosmic.cachix.org/" ];
trusted-public-keys = [ "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" ]; trusted-public-keys = [ "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" ];
}; };
}; };
options = {
cosmic-applets = lib.mkOption {default = pkgs.cosmic-applets;};
cosmic-applibrary = lib.mkOption {default = pkgs.cosmic-applibrary;};
cosmic-bg = lib.mkOption {default = pkgs.cosmic-bg;};
cosmic-comp = lib.mkOption {default = pkgs.cosmic-comp;};
cosmic-design-demo = lib.mkOption {default = pkgs.cosmic-design;};
cosmic-edit = lib.mkOption {default = pkgs.cosmic-edit;};
cosmic-files = lib.mkOption {default = pkgs.cosmic-files;};
cosmic-icons = lib.mkOption {default = pkgs.cosmic-icons;};
cosmic-launcher = lib.mkOption {default = pkgs.cosmic-launcher;};
cosmic-notifications = lib.mkOption {default = pkgs.cosmic-notifications;};
cosmic-osd = lib.mkOption {default = pkgs.cosmic-osd;};
cosmic-panel = lib.mkOption {default = pkgs.cosmic-panel;};
cosmic-protocols = lib.mkOption {default = pkgs.cosmic-protocols;};
cosmic-randr = lib.mkOption {default = pkgs.cosmic-randr;};
cosmic-screenshot = lib.mkOption {default = pkgs.cosmic-screenshot;};
cosmic-session = lib.mkOption {default = pkgs.cosmic-session;};
cosmic-settings = lib.mkOption {default = pkgs.cosmic-settings;};
cosmic-settings-daemon = lib.mkOption {default = pkgs.cosmic-settings;};
cosmic-term = lib.mkOption {default = pkgs.cosmic-term;};
cosmic-workspaces-epoch = lib.mkOption {default = pkgs.cosmic-workspaces;};
wrapCosmicAppsHook = lib.mkOption {default = pkgs.wrapCosmicAppsHook;};
xdg-desktop-portal-cosmic = lib.mkOption {default = pkgs.xdg-desktop-portal-cosmic;};
};
} }

View file

@ -16,11 +16,15 @@ in
"${nixos-cosmic}/nixos/cosmic-greeter/module.nix" "${nixos-cosmic}/nixos/cosmic-greeter/module.nix"
]; ];
config = { config = {
services.displayManager.cosmic-greeter.enable = true; services.xserver.desktopManager.cosmic.enable = true;
services.xserver.displayManager.cosmic-greeter.enable = true;
nixpkgs.overlays = [ cosmicPkgsOverlay ]; nixpkgs.overlays = [ cosmicPkgsOverlay ];
nix.settings = { nix.settings = {
substituters = [ "https://cosmic.cachix.org/" ]; substituters = [ "https://cosmic.cachix.org/" ];
trusted-public-keys = [ "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" ]; trusted-public-keys = [ "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" ];
}; };
}; };
options = {
cosmic-greeter = lib.mkOption {default = pkgs.cosmic-greeter;};
};
} }

View file

@ -17,25 +17,17 @@ let
setuptools setuptools
] ++ old.propagatedBuildInputs; ] ++ old.propagatedBuildInputs;
}); });
aliasDrag = pkgs.writeScriptBin "drag" ''
${unstablePkgs.ripdrag}/bin/ripdrag -Axd $@
'';
in in
{ {
imports = [ imports = [
./unstable-packages.nix ./unstable-packages.nix
]; ];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
aliasDrag
rangerGit rangerGit
kitty kitty
zoxide zoxide
]; ];
programs.bash.shellInit = ''
HISTCONTROL=ignoreboth
'';
programs.bash.interactiveShellInit = '' programs.bash.interactiveShellInit = ''
if test -n "$KITTY_INSTALLATION_DIR"; then if test -n "$KITTY_INSTALLATION_DIR"; then
export KITTY_SHELL_INTEGRATION="enabled,no-sudo" export KITTY_SHELL_INTEGRATION="enabled,no-sudo"