diff --git a/cdist/type/__manjaro_desktop/manifest b/cdist/type/__manjaro_desktop/manifest index 1f9efd9..7d90246 100644 --- a/cdist/type/__manjaro_desktop/manifest +++ b/cdist/type/__manjaro_desktop/manifest @@ -22,6 +22,7 @@ package_list=" clipmenu dbeaver emacs + feh filezilla firefox fish @@ -57,8 +58,6 @@ package_list=" vlc " -# missing AUR packages: android-studio, ncspot, postman, scrcp, seafile-client - for package in $package_list do require="__package_upgrade_all" __package $package --state=present done @@ -81,6 +80,8 @@ aur_packages=" ncspot postman-bin rescrobbled-git + scrcpy + seafile-client " for package in $aur_packages diff --git a/chezmoi.json b/chezmoi.json deleted file mode 100644 index 816e47b..0000000 --- a/chezmoi.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "diff": { - "format": "git" - }, - "sourceDir": "/etc/nixos/chezmoi" -} diff --git a/chezmoi/dot_config/.keep b/chezmoi/dot_config/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/chezmoi/dot_config/i3/.keep b/chezmoi/dot_config/i3/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/chezmoi/dot_config/i3/config b/chezmoi/dot_config/i3/config deleted file mode 100644 index 1877761..0000000 --- a/chezmoi/dot_config/i3/config +++ /dev/null @@ -1,206 +0,0 @@ -# This file has been auto-generated by i3-config-wizard(1). -# It will not be overwritten, so edit it as you like. -# -# Should you change your keyboard layout some time, delete -# this file and re-run i3-config-wizard(1). -# - -# i3 config file (v4) -# -# Please see https://i3wm.org/docs/userguide.html for a complete reference! - -set $mod Mod4 - -# Font for window titles. Will also be used by the bar unless a different font -# is used in the bar {} block below. -font pango:Fira Code Light 8 - -# This font is widely installed, provides lots of unicode glyphs, right-to-left -# text rendering and scalability on retina/hidpi displays (thanks to pango). -#font pango:DejaVu Sans Mono 8 - -# The combination of xss-lock, nm-applet and pactl is a popular choice, so -# they are included here as an example. Modify as you see fit. - -# xss-lock grabs a logind suspend inhibit lock and will use i3lock to lock the -# screen before suspend. Use loginctl lock-session to lock your screen. -exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock --nofork - -# NetworkManager is the most popular way to manage wireless networks on Linux, -# and nm-applet is a desktop environment-independent system tray GUI for it. -exec --no-startup-id nm-applet - -# Use pactl to adjust volume in PulseAudio. -set $refresh_i3status killall -SIGUSR1 i3status -bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +10% && $refresh_i3status -bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -10% && $refresh_i3status -bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle && $refresh_i3status -bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle && $refresh_i3status - -# Use Mouse+$mod to drag floating windows to their wanted position -floating_modifier $mod - -# custom keybindings -bindsym $mod+Return exec alacritty -bindsym $mod+y exec passmenu -bindsym $mod+x exec emacs -bindsym $mod+c exec firefox - -# kill focused window -bindsym $mod+Shift+q kill - -# start dmenu (a program launcher) -bindsym $mod+d exec "dmenu_run -nf '#F8F8F2' -nb '#282A36' -sb '#6272A4' -sf '#F8F8F2' -fn 'monospace-10' -p 'dmenu%'" -# There also is the (new) i3-dmenu-desktop which only displays applications -# shipping a .desktop file. It is a wrapper around dmenu, so you need that -# installed. -# bindsym $mod+d exec --no-startup-id i3-dmenu-desktop - -# change focus -bindsym $mod+j focus left -bindsym $mod+k focus down -bindsym $mod+l focus up -bindsym $mod+odiaeresis focus right - -# alternatively, you can use the cursor keys: -bindsym $mod+Left focus left -bindsym $mod+Down focus down -bindsym $mod+Up focus up -bindsym $mod+Right focus right - -# move focused window -bindsym $mod+Shift+j move left -bindsym $mod+Shift+k move down -bindsym $mod+Shift+l move up -bindsym $mod+Shift+odiaeresis move right - -# alternatively, you can use the cursor keys: -bindsym $mod+Shift+Left move left -bindsym $mod+Shift+Down move down -bindsym $mod+Shift+Up move up -bindsym $mod+Shift+Right move right - -# split in horizontal orientation -bindsym $mod+h split h - -# split in vertical orientation -bindsym $mod+v split v - -# enter fullscreen mode for the focused container -bindsym $mod+f fullscreen toggle - -# change container layout (stacked, tabbed, toggle split) -bindsym $mod+s layout stacking -bindsym $mod+w layout tabbed -bindsym $mod+e layout toggle split - -# toggle tiling / floating -bindsym $mod+Shift+space floating toggle - -# change focus between tiling / floating windows -bindsym $mod+space focus mode_toggle - -# focus the parent container -bindsym $mod+a focus parent - -# focus the child container -#bindsym $mod+d focus child - -# Define names for default workspaces for which we configure key bindings later on. -# We use variables to avoid repeating the names in multiple places. -set $ws1 "1" -set $ws2 "2" -set $ws3 "3" -set $ws4 "4" -set $ws5 "5" -set $ws6 "6" -set $ws7 "7" -set $ws8 "8" -set $ws9 "9" -set $ws10 "10" - -# switch to workspace -bindsym $mod+1 workspace number $ws1 -bindsym $mod+2 workspace number $ws2 -bindsym $mod+3 workspace number $ws3 -bindsym $mod+4 workspace number $ws4 -bindsym $mod+5 workspace number $ws5 -bindsym $mod+6 workspace number $ws6 -bindsym $mod+7 workspace number $ws7 -bindsym $mod+8 workspace number $ws8 -bindsym $mod+9 workspace number $ws9 -bindsym $mod+0 workspace number $ws10 - -# move focused container to workspace -bindsym $mod+Shift+1 move container to workspace number $ws1 -bindsym $mod+Shift+2 move container to workspace number $ws2 -bindsym $mod+Shift+3 move container to workspace number $ws3 -bindsym $mod+Shift+4 move container to workspace number $ws4 -bindsym $mod+Shift+5 move container to workspace number $ws5 -bindsym $mod+Shift+6 move container to workspace number $ws6 -bindsym $mod+Shift+7 move container to workspace number $ws7 -bindsym $mod+Shift+8 move container to workspace number $ws8 -bindsym $mod+Shift+9 move container to workspace number $ws9 -bindsym $mod+Shift+0 move container to workspace number $ws10 - -# reload the configuration file -bindsym $mod+Shift+c reload -# restart i3 inplace (preserves your layout/session, can be used to upgrade i3) -bindsym $mod+Shift+r restart -# exit i3 (logs you out of your X session) -bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -B 'Yes, exit i3' 'i3-msg exit'" - -# resize window (you can also use the mouse for that) -mode "resize" { - # These bindings trigger as soon as you enter the resize mode - - # Pressing left will shrink the window’s width. - # Pressing right will grow the window’s width. - # Pressing up will shrink the window’s height. - # Pressing down will grow the window’s height. - bindsym j resize shrink width 10 px or 10 ppt - bindsym k resize grow height 10 px or 10 ppt - bindsym l resize shrink height 10 px or 10 ppt - bindsym odiaeresis resize grow width 10 px or 10 ppt - - # same bindings, but for the arrow keys - bindsym Left resize shrink width 10 px or 10 ppt - bindsym Down resize grow height 10 px or 10 ppt - bindsym Up resize shrink height 10 px or 10 ppt - bindsym Right resize grow width 10 px or 10 ppt - - # back to normal: Enter or Escape or $mod+r - bindsym Return mode "default" - bindsym Escape mode "default" - bindsym $mod+r mode "default" -} - -bindsym $mod+r mode "resize" - -# Dracula Theme -# class border bground text indicator child_border -client.focused #6272A4 #6272A4 #F8F8F2 #6272A4 #6272A4 -client.focused_inactive #44475A #44475A #F8F8F2 #44475A #44475A -client.unfocused #282A36 #282A36 #BFBFBF #282A36 #282A36 -client.urgent #44475A #FF5555 #F8F8F2 #FF5555 #FF5555 -client.placeholder #282A36 #282A36 #F8F8F2 #282A36 #282A36 - -client.background #F8F8F2 - -# Start i3bar to display a workspace bar (plus the system information i3status -# finds out, if available) -bar { - status_command i3status - - colors { - background #282A36 - statusline #F8F8F2 - separator #44475A - - focused_workspace #44475A #44475A #F8F8F2 - active_workspace #282A36 #44475A #F8F8F2 - inactive_workspace #282A36 #282A36 #BFBFBF - urgent_workspace #FF5555 #FF5555 #F8F8F2 - binding_mode #FF5555 #FF5555 #F8F8F2 - } -} diff --git a/chezmoi/dot_config/ncspot/.keep b/chezmoi/dot_config/ncspot/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/chezmoi/dot_config/ncspot/config.toml b/chezmoi/dot_config/ncspot/config.toml deleted file mode 100644 index 71bd381..0000000 --- a/chezmoi/dot_config/ncspot/config.toml +++ /dev/null @@ -1,18 +0,0 @@ -[theme] -background = "black" -primary = "light white" -secondary = "light black" -title = "green" -playing = "green" -playing_selected = "light green" -playing_bg = "black" -highlight = "light white" -highlight_bg = "#484848" -error = "light white" -error_bg = "red" -statusbar = "black" -statusbar_progress = "green" -statusbar_bg = "green" -cmdline = "light white" -cmdline_bg = "black" -search_match = "light red" diff --git a/configuration.nix b/configuration.nix deleted file mode 100644 index e5ea485..0000000 --- a/configuration.nix +++ /dev/null @@ -1,187 +0,0 @@ -# Edit this configuration file to define what should be installed on -# your system. Help is available in the configuration.nix(5) man page -# and in the NixOS manual (accessible by running ‘nixos-help’). - -{ config, pkgs, ... }: -let - unstable = import { config = { allowUnfree = true; }; }; -in -{ - imports = - [ # Include the results of the hardware scan. - ./hardware-configuration.nix - ]; - - # Use the systemd-boot EFI boot loader. - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; - boot.loader.grub.useOSProber = true; - - networking.hostName = "schrofi-desktop"; # Define your hostname. - #networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. - networking.networkmanager = { - enable = true; - packages = with pkgs; [ - networkmanager-openvpn - ]; - }; - - # configuration for package installation - nixpkgs.config = { - allowUnfree = true; - pulseaudio = true; - }; - - # The global useDHCP flag is deprecated, therefore explicitly set to false here. - # Per-interface useDHCP will be mandatory in the future, so this generated config - # replicates the default behaviour. - networking.useDHCP = false; - networking.interfaces.enp30s0.useDHCP = true; - - # Configure network proxy if necessary - # networking.proxy.default = "http://user:password@proxy:port/"; - # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; - - # Select internationalisation properties. - # i18n.defaultLocale = "en_US.UTF-8"; - console = { - font = "Lat2-Terminus16"; - keyMap = "de"; - }; - - # Set your time zone. - time.timeZone = "Europe/Vienna"; - - fonts = { - fonts = with pkgs; [ - fira - fira-code - fira-code-symbols - ]; - fontconfig = { - defaultFonts = { - sansSerif = [ "Fira Sans" ]; - monospace = [ "Fira Code" ]; - }; - }; - }; - - # List packages installed in system profile. - environment.systemPackages = with pkgs; [ - unstable.androidStudioPackages.stable - alacritty - chezmoi - chromium - clipmenu - dbeaver - emacs - filezilla - firefox - fish - flameshot - galculator - gimp - git - git-lfs - gnupg - gparted - unstable.gradle - htop - i3 - jdk - jmtpfs - libreoffice - mosh - ncspot - networkmanager - nomacs - ntfs3g - openvpn - pass - pavucontrol - pinentry - postman - pulseaudio - ranger - scrcpy - seafile-client - thunderbird - udevil - unar - vlc - ]; - - environment.variables = { - EDITOR = "emacs"; - VISUAL = "emacs"; - }; - - # Some programs need SUID wrappers, can be configured further or are - # started in user sessions. - programs.adb.enable = true; - programs.seahorse.enable = true; - # programs.mtr.enable = true; - programs.gnupg.agent = { - enable = true; - # enableSSHSupport = true; - pinentryFlavor = "gtk2"; - }; - - # List services that you want to enable: - - # Enable the OpenSSH daemon. - # services.openssh.enable = true; - - # Open ports in the firewall. - # networking.firewall.allowedTCPPorts = [ ... ]; - # networking.firewall.allowedUDPPorts = [ ... ]; - # Or disable the firewall altogether. - # networking.firewall.enable = false; - - # Enable CUPS to print documents. - # services.printing.enable = true; - - # Enable sound. - sound.enable = true; - hardware.pulseaudio.enable = true; - - # Enable the X11 windowing system. - services.xserver.enable = true; - services.xserver.layout = "de"; - services.xserver.videoDrivers = [ "nvidia" ]; - # services.xserver.xkbOptions = "eurosign:e"; - - # Enable touchpad support. - # services.xserver.libinput.enable = true; - - services.xserver.windowManager.i3.enable = true; - services.xserver.displayManager.lightdm.enable = true; - services.xserver.desktopManager.wallpaper.combineScreens = false; - services.xserver.desktopManager.wallpaper.mode = "fill"; - - # Enable keychain - services.gnome3.gnome-keyring.enable = true; - security.pam.services.lightdm.enableGnomeKeyring = true; - - # Define a user account. Don't forget to set a password with ‘passwd’. - # users.users.jane = { - # isNormalUser = true; - # extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user. - # }; - - users.users.schrofi = { - isNormalUser = true; - home = "/home/schrofi"; - description = "Florian Schrofner"; - shell = pkgs.fish; - extraGroups = ["wheel" "audio" "adbusers" "networkmanager"]; - }; - - # This value determines the NixOS release from which the default - # settings for stateful data, like file locations and database versions - # on your system were taken. It‘s perfectly fine and recommended to leave - # this value at the release version of the first install of this system. - # Before changing this value read the documentation for this option - # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). - system.stateVersion = "20.03"; # Did you read the comment? -} \ No newline at end of file diff --git a/readme.md b/readme.md index 8d2cd90..76db1f5 100644 --- a/readme.md +++ b/readme.md @@ -14,30 +14,22 @@ sudo python setup.py install ``` 2. Setup SSH root access -//TODO - -3. CD into wanted configuration directory and apply configuration to localhost +Add the following line into your `/etc/ssh/sshd_config` ``` -cdist config -v -i manifest localhost +PermitRootLogin without-password ``` -## Getting Started - DEPRECATED NIXOS -1. Clone the repository into your /etc/nixos directory (delete/rename the existing configuration.nix). -2. Add the unstable NixOS channel +Then copy your SSH key to the root user at localhost. ``` -nix-channel --add https://nixos.org/channels/nixos-unstable nixos-unstable +ssh-copy-id root@localhost ``` -3. Build the system with the cloned configuration, this will also create the "schrofi" user. + +Finally, start the ssh daemon if it is not running ``` -nixos-rebuild switch +sudo systemctl start sshd ``` -4. Switch to the user and symlink the chezmoi config to the new users home dir. + +3. CD into this repository and execute the following command: ``` -mkdir -p ~/.config/chezmoi -ln -s /etc/nixos/chezmoi.json /home/schrofi/.config/chezmoi/chezmoi.json +cdist config -vv -c ./cdist localhost ``` -5. Apply the configuration -``` -chezmoi apply -``` -6. Done