Skip to content

Cosmic de #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
mark-boute wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

Cosmic de #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5ea3ffd
Add COSMIC to flake.nix
mark-boute Sep 7, 2024
deb75bf
Update and clean configuration.nix
mark-boute Sep 7, 2024
b4192fa
Add input to flake.nix
mark-boute Sep 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@
inputs.nixpkgs.follows = "nixpkgs";
};

nixvim = {
url = "github:nix-community/nixvim";
nixos-cosmic = {
url = "github:lilyinstarlight/nixos-cosmic";
inputs.nixpkgs.follows = "nixpkgs";
};

};

outputs = { self, nixpkgs, nixpkgs-unstable, home-manager, ... } @ inputs:
outputs = { self, nixpkgs, nixpkgs-unstable, home-manager, nixos-cosmic, ... } @ inputs:
let
mkSystem = packages: system: hostname: main-user:
nixpkgs.lib.nixosSystem {
Expand Down Expand Up @@ -64,6 +64,15 @@
users.${main-user} = ./hosts/${hostname}/home.nix;
};
}

nixos-cosmic.nixosModules.default # https://github.com/lilyinstarlight/nixos-cosmic
{
nix.settings = {
substituters = [ "https://cosmic.cachix.org/" ];
trusted-public-keys = [ "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" ];
};
}

];
};
in
Expand All @@ -73,4 +82,4 @@
ties-laptop = mkSystem nixpkgs "x86_64-linux" "ties-laptop" "tiesd";
};
};
}
}
44 changes: 14 additions & 30 deletions hosts/laptop/configuration.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,12 @@ in
../../modules
];

programs.tmux.enable = true;
main-user = {
enable = true;
sudoUser = true;
userName = username;
description = "Mark Boute";
};

modules = {
system.gpu.optimus-prime = {
Expand All @@ -30,41 +35,30 @@ in
development-tools.r = { enable = true; rstudio = true; };
};

# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.

main-user = {
enable = true;
sudoUser = true;
userName = username;
description = "Mark Boute";
programs = {
tmux.enable = true;
firefox.enable = true;
};

# Enable numlock on GDM login screen
programs.dconf.profiles.gdm.databases = [{
settings."org/gnome/desktop/peripherals/keyboard".numlock-state = true;
}];

# home-manager = {
# extraSpecialArgs = { inherit inputs; };
# users = {
# "${username}" = import ./home.nix;
# };
# };

# Configure network proxy if necessary
# networking.proxy.default = "http://user:password@proxy:port/";
# networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";

# Enable networking
networking.networkmanager.enable = true;

# Enable the X11 windowing system.
services.xserver.enable = true;

# Enable the GNOME Desktop Environment.
# Enable the GNOME Desktop Environment and GDM
services.xserver.displayManager.gdm.enable = true;
services.xserver.desktopManager.gnome.enable = true;

# Enable the COSMIC Desktop Environment without cosmic-greeter
services.desktopManager.cosmic.enable = true;
services.displayManager.cosmic-greeter.enable = false;

# Enable the Hyprland compositor
programs.hyprland.enable = true;

Expand Down Expand Up @@ -99,14 +93,4 @@ in
# Enable touchpad support (enabled default in most desktopManager).
services.libinput.enable = true;

# Install firefox.
programs.firefox.enable = true;

# List services that you want to enable:

# Open ports in the firewall.
# networking.firewall.allowedTCPPorts = [ ... ];
# networking.firewall.allowedUDPPorts = [ ... ];
# Or disable the firewall altogether.
# networking.firewall.enable = false;
}