diff --git a/README.md b/README.md index 143da755..785d00f7 100644 --- a/README.md +++ b/README.md @@ -1,29 +1,24 @@ -# Apricity OS +# Condres OS **Thinking about contributing? Click below to take a look at what developers are talking about on Gitter.** -[![Join the chat at https://gitter.im/Apricity-OS/apricity-build](https://badges.gitter.im/Apricity-OS/apricity-build.svg)](https://gitter.im/Apricity-OS/apricity-build?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) -####Links -Download The March 64-Bit GNOME Version [Direct](https://sourceforge.net/projects/apricityos/files/apricity_os-gnome-03.2016-beta.iso/download) or [Torrent](http://apricityos.com/iso/apricity_os-gnome-03.2016-beta.torrent) -Download The March 64-Bit Cinnamon Version [Direct](https://sourceforge.net/projects/apricityos/files/apricity_os-cinnamon-03.2016-beta.iso/download) or [Torrent](http://apricityos.com/iso/apricity_os-cinnamon-03.2016-beta.torrent) +SupportCondres on (https://www.codelinsoft.it/sito/2015-02-18-23-59-25/donate.html) -Support Apricity on [Patreon](http://www.patreon.com/apricity) -![Apricity Laptop](http://apricityos.com/assets/img/back/apricity-laptop.jpg) -####Apricity's Goal: Simple, Beautiful Linux +####Condres's Goal: Simple, Beautiful Linux -####What's Apricity OS -Apricity OS is an Arch Linux-based distribution with a nice-looking default interface, useful preinstalled applications, and two editions (more coming soon!). The idea is that if your Linux distribution works well as soon as you install it, you have to do less work. If you then decide to install Apricity on another machine, everything still works. +####What's Condres OS +Condres OS is an Arch Linux-based distribution with a nice-looking default interface, useful preinstalled applications, and two editions (more coming soon!). The idea is that if your Linux distribution works well as soon as you install it, you have to do less work. If you then decide to installCondres on another machine, everything still works. ####What's configured out of the box? -**Desktop Environment (DE) Theme:** This is mainly the Gnome or Cinnamon top or bottom panel, respectively. For Gnome, it also includes how the activities' overview, workspace switching, and the dock look. For Cinnamon, this also includes workspace switching, the application menu, and the window overview. The Gnome shell theme is custom built for Apricity, and the Cinnamon theme is based on Arc. +**Desktop Environment (DE) Theme:** This is mainly the Gnome or Cinnamon top or bottom panel, respectively. For Gnome, it also includes how the activities' overview, workspace switching, and the dock look. For Cinnamon, this also includes workspace switching, the application menu, and the window overview. The Gnome shell theme is custom built forCondres, and the Cinnamon theme is based on Arc. -**GTK Theme:** Apricity uses [Arc GTK](https://github.com/horst3180/arc-theme) by default, but post something on [Gitter](https://gitter.im/Apricity-OS/apricity-build) if you know of other great-looking GTK themes. +**GTK Theme:**Condres uses [Arc GTK](https://github.com/horst3180/arc-theme) by default, but post something on [Gitter](https://gitter.im/Condres-OS/Condres-build) if you know of other great-looking GTK themes. -**DE Extensions:** Gnome is a little unintuitive and clunky to use normally, but the Gnome developers have made it easy for other developers to customize its functionality with extensions. The extensions that are enabled by default in Apricity are as follows: +**DE Extensions:** Gnome is a little unintuitive and clunky to use normally, but the Gnome developers have made it easy for other developers to customize its functionality with extensions. The extensions that are enabled by default inCondres are as follows: - Caffeine - Dash to dock - Frippery move clock @@ -38,29 +33,14 @@ Apricity OS is an Arch Linux-based distribution with a nice-looking default inte **Icons:** Application icons come by default as `numix-circle`, and the various symbolic and mimetype icons are a combination of `vimix` and `paper`. -**Terminal:** Apricity uses `zsh` and `powerline-shell` in its default terminal. +**Terminal:**Condres uses `zsh` and `powerline-shell` in its default terminal. -**Browser:** This is a point of some debate. Several people have brought up the point that Chromium is available as an open source alternative to Chrome, which is the current default. The counter-argument is that Chrome has better support for closed-source codecs. The decision to include a set of Chrome extensions, enumerated below, was also somewhat contraversial. **Update: default extensions may be broken in the latest release?** For further discussion, refer to [Gitter](https://gitter.im/Apricity-OS/apricity-build), or feel free to start a thread on the [forum](http://apricityos.com/forum) or an [issue](https://github.com/Apricity-OS/apricity-build/issues). -- Pushbullet (may be replaced by [KDEConnect](https://community.kde.org/KDEConnect) or [Pushjet](https://pushjet.io/) in the near future) -- Adblock Plus -- Ghostery -- The Great Suspender -**Wallpapers:** Apricity comes with a really nice set of [Creative Commons](https://creativecommons.org/) wallpapers, some of which go really well with the default Apricity themes, and some of which just look great on their own. If you have any suggestions for wallpapers to include in future releases, either post something on [Gitter](https://gitter.im/Apricity-OS/apricity-build), the [forum](http://apricityos.com/forum), or just submit a pull request to the [apricity-wallpapers](https://github.com/Apricity-OS/apricity-wallpapers) repository. -**Vim:** The following plugins are included in Apricity's default Vim configuration: -- Pathogen -- Nerdtree -- Vim-nerdtree-tabs -- Syntastic -- Vim-airline -- Vim-sensible -- Vim-tabber +Also of note:Condres's Vim uses a slightly modified version of the [Monokai](https://github.com/sickill/vim-monokai) colorscheme. -Also of note: Apricity's Vim uses a slightly modified version of the [Monokai](https://github.com/sickill/vim-monokai) colorscheme. +####What applications are included inCondres? -####What applications are included in Apricity? -Here's an (almost exhaustive) list of included programs. Please feel free to discuss these choices on [Gitter](https://gitter.im/Apricity-OS/apricity-build) or the [forum](http://apricityos.com/forum). - Pamac (Add/Remove Software; Software Update) - File Roller (Archive Manager) - Gnome-Calculator @@ -87,7 +67,6 @@ Here's an (almost exhaustive) list of included programs. Please feel free to dis - Gnome-Screenshot - Settings - Simple Backup -- Steam **[Sometimes Broken?](https://github.com/Apricity-OS/apricity-build/issues/20#issuecomment-206939955), [Also Here](http://apricityos.com/forum/discussion/comment/1114#Comment_1114)** - Syncthing - System Log - System Monitor @@ -97,8 +76,8 @@ Here's an (almost exhaustive) list of included programs. Please feel free to dis - Totem (Gnome-Videos) ####So you want to contribute? -That's great! Fork *this* repository, pull it to your local machine, and start by building a version of the ISO. You'll need to be running something Arch-based, since you need to install `archiso` to run the build scripts. Then run `su -c './build.sh -v -E gnome -R true'`, type your root password, and watch as `mkarchiso` does its magic. (If I forgot to put a dependency here, please create an [issue](https://github.com/Apricity-OS/apricity-build/issues)) +That's great! Fork *this* repository, pull it to your local machine, and start by building a version of the ISO. You'll need to be running something Arch-based, since you need to install `archiso` to run the build scripts. Then run `su -c './build.sh -v -E gnome -R true'`, type your root password, and watch as `mkarchiso` does its magic. (If I forgot to put a dependency here, please create an [issue](https://github.com/Condres-OS/Condres-build/issues)) -Once you've built an image, you can test it with `gnome-boxes`, `virtualbox`, or another emulator of your choice. Now, as a quick experiment, try opening `apricity-build/packages/packages.all.x86_64` and adding or removing something. Play with the build script and get comfortable using it. See if you can figure out what the other command-line arguments are, and try to build the Cinnamon edition. (Official docs are coming soon, I promise!) +Once you've built an image, you can test it with `gnome-boxes`, `virtualbox`, or another emulator of your choice. Now, as a quick experiment, try opening `Condres-build/packages/packages.all.x86_64` and adding or removing something. Play with the build script and get comfortable using it. See if you can figure out what the other command-line arguments are, and try to build the Cinnamon edition. (Official docs are coming soon, I promise!) -Now pick something to work on. Take a look at [TODO.md](https://github.com/Apricity-OS/apricity-build/blob/master/TODO.md) for ideas. Once you've finished your feature or fixed your bug, submit a [pull request](https://help.github.com/articles/using-pull-requests/). If everything looks good, it will get incorporated first into the `dev` branch, then later into the `stable` branch! +Now pick something to work on. Take a look at [TODO.md] for ideas. Once you've finished your feature or fixed your bug, submit a [pull request](https://help.github.com/articles/using-pull-requests/). If everything looks good, it will get incorporated first into the `dev` branch, then later into the `stable` branch! diff --git a/TODO.md b/TODO.md index 4bb9f03e..6ef83fa5 100644 --- a/TODO.md +++ b/TODO.md @@ -3,12 +3,9 @@ ####Bugs - [x] Fix [bug with numix-folders](https://github.com/numixproject/numix-folders/issues/133) - [x] Fix all the GTK warnings about some parts of the icon theme not declaring a size field -- [ ] Chrome extensions enabled by default may be broken on some machines -- [ ] Issue with steam [thread1](https://github.com/Apricity-OS/apricity-build/issues/20#issuecomment-206939955), [thread2](https://github.com/Apricity-OS/apricity-build/issues/20#issuecomment-206939955) -- [ ] Chsh to /bin/zsh for new users, not just one made in installer ####Distro Features -- [ ] Add a 32-bit version (shouldn't be too hard, just need to test on a 32-bit machine) +- [x] Remove support a 32-bit version (shouldn't be too hard, just need to test on a 32-bit machine) - [ ] Add a more verbose error to the installer when a user decides to install a bootloader on a UEFI machine and chooses manual partitioning but forgets to create a FAT32-formatted /boot/efi partition - [ ] Automatic timezone selection for the installer - [ ] Replace (or augment) `simple-backup` with [timeshift](http://www.teejeetech.in/p/timeshift.html)? @@ -34,17 +31,14 @@ - [ ] More elegant firstrun.sh functionality ####General Features -- [ ] Automatically update PATRONS.md weekly with [patreon-api](https://github.com/oxguy3/patreon-api)? - [ ] Automatically update `calamares` weekly? - [ ] Enable package signing in repo -- [ ] Automatically rebuild repo daily, pulling from the AUR and from github for Apricity packages (eventially this could be run in an AWS EC2 spot instance) - [ ] Automatically build dev ISO in an AWS spot instance bi-weekly - [x] Split github repos into stable and dev -- [x] Update all PKGBUILD urls to reflect the move to [github.com/Apricity-OS](https://github.com/Apricity-OS) - [ ] Add READMEs to all repositories -- [ ] Replace `apricityassets`. It's a little confusing and convoluted. Replace it with `apricity-assets`, `apricity-plymouth`, and `apricity-gnome-extensions`. +- [ ] Replace `condresassets`. It's a little confusing and convoluted. Replace it with `condres-assets`, `condres-plymouth`, and `condres-gnome-extensions`. - [ ] Automatically update extensions from github -- [ ] Add mirrors to `apricity-core` +- [x] Remove mirrors to `apricity-core` - [ ] **Custom ISO Builder** - This is going to be a web form that one can fill out to select a DE, their preferred applications, a shell and GUI theme, an icon theme, some wallpapers, `systemd` services to enable, and a branch of the kernel to install. Then a custom ISO would get built on AWS and a link would be emailed to the user. The *issue* is that this would cost roughly $0.10 per build, so we need some sort of increase in revenue. - [ ] **Cloud Configuration** @@ -57,12 +51,12 @@ ####Desktop Environments - [x] Gnome - [x] Cinnamon -- [ ] XFCE -- [ ] KDE -- [ ] MATE +- [x] XFCE +- [x] KDE +- [x] MATE - [ ] i3 / [sway](http://swaywm.org/)? -- [ ] Budgie? -- [ ] Pantheon? +- [x] Budgie? +- [x] Pantheon? ####General - [ ] Write docs for build scripts and installation diff --git a/_config.yml b/_config.yml new file mode 100644 index 00000000..c4192631 --- /dev/null +++ b/_config.yml @@ -0,0 +1 @@ +theme: jekyll-theme-cayman \ No newline at end of file diff --git a/airootfs-x86_64/etc/hostname b/airootfs-x86_64/etc/hostname index 129eabd2..4363b132 100755 --- a/airootfs-x86_64/etc/hostname +++ b/airootfs-x86_64/etc/hostname @@ -1 +1 @@ -apricity +condres diff --git a/airootfs-x86_64/etc/pacman.conf b/airootfs-x86_64/etc/pacman.conf index abe519e7..5cc29895 100755 --- a/airootfs-x86_64/etc/pacman.conf +++ b/airootfs-x86_64/etc/pacman.conf @@ -72,9 +72,9 @@ LocalFileSigLevel = Optional # An example of a custom package repository. See the pacman manpage for # tips on creating your own repositories. -[apricity-core] +[condres-core] SigLevel = Required -Server = http://static.apricityos.com/apricity-core-signed/ +Server = https://repository.codelinsoft.it/condres-core-signed/ #[testing] #Include = /etc/pacman.d/mirrorlist diff --git a/airootfs-x86_64/root/customize_airootfs.sh b/airootfs-x86_64/root/customize_airootfs.sh index 9a944e11..ada2cd70 100755 --- a/airootfs-x86_64/root/customize_airootfs.sh +++ b/airootfs-x86_64/root/customize_airootfs.sh @@ -23,7 +23,7 @@ echo 'Created User' # pacman-key --populate archlinux # pacman-key --init # pacman-key --init apricity -# pacman-key --populate apricity +# pacman-key --populate condres # pacman-key --populate # pacman -Syy # pacman-key --refresh-keys @@ -36,11 +36,11 @@ echo 'Created User' sudo -u liveuser freezedry --load /etc/freezedry/default.toml --livecd || /bin/true #Name Apricity -sed -i.bak 's/Arch Linux/Apricity OS/g' /usr/lib/os-release +sed -i.bak 's/Arch Linux/Condres OS/g' /usr/lib/os-release sed -i.bak 's/arch/apricity/g' /usr/lib/os-release -sed -i.bak 's/www.archlinux.org/www.apricityos.com/g' /usr/lib/os-release -sed -i.bak 's/bbs.archlinux.org/www.apricityos.com/g' /usr/lib/os-release -sed -i.bak 's/bugs.archlinux.org/www.apricityos.com/g' /usr/lib/os-release +sed -i.bak 's/www.archlinux.org/http://www.codelinsoft.it/sito//g' /usr/lib/os-release +sed -i.bak 's/bbs.archlinux.org/https://www.codelinsoft.it/sito/forum.html/g' /usr/lib/os-release +sed -i.bak 's/bugs.archlinux.org/https://www.codelinsoft.it/sito/forum.html/g' /usr/lib/os-release cp /usr/lib/os-release /etc/os-release #Run Architecture-Specific Tasks diff --git a/packages/base_packages_x86_64 b/packages/base_packages_x86_64 index 4633b506..42002e5a 100644 --- a/packages/base_packages_x86_64 +++ b/packages/base_packages_x86_64 @@ -1,6 +1,6 @@ -apricity-freezedry -apricityassets -apricity-keyring +condres-freezedry +condresassets +condres-keyring mkinitcpio-openswap alsa-utils lib32-alsa-plugins diff --git a/pacman/pacman.i686.conf b/pacman/pacman.i686.conf index 5f94dad5..ed69ede4 100644 --- a/pacman/pacman.i686.conf +++ b/pacman/pacman.i686.conf @@ -72,9 +72,9 @@ LocalFileSigLevel = Optional # An example of a custom package repository. See the pacman manpage for # tips on creating your own repositories. -[apricity-core-dev] +[condres-core-dev] SigLevel = Optional -Server = http://static.apricityos.com/apricity-core-dev-i686 +Server = https://repository.codelinsoft.it/condres-core-dev-i686 #[testing] #Include = /etc/pacman.d/mirrorlist diff --git a/pacman/pacman.x86_64.conf b/pacman/pacman.x86_64.conf index 0094e79d..5f660f25 100644 --- a/pacman/pacman.x86_64.conf +++ b/pacman/pacman.x86_64.conf @@ -72,9 +72,9 @@ LocalFileSigLevel = Optional # An example of a custom package repository. See the pacman manpage for # tips on creating your own repositories. -[apricity-core] +[condres-core] SigLevel = Optional -Server = http://static.apricityos.com/apricity-core-signed +Server = https://repository.codelinsoft.it/condres-core-signed #[testing] #Include = /etc/pacman.d/mirrorlist diff --git a/syslinux-x86_64/archiso_sys64.cfg b/syslinux-x86_64/archiso_sys64.cfg index 5ce469a4..e116462b 100644 --- a/syslinux-x86_64/archiso_sys64.cfg +++ b/syslinux-x86_64/archiso_sys64.cfg @@ -1,9 +1,9 @@ LABEL arch64 TEXT HELP -Boot the Apricity OS (x86_64) live medium. -It allows you to install Apricity OS or perform system maintenance. +Boot the Condres (x86_64) live medium. +It allows you to install Condres OS or perform system maintenance. ENDTEXT -MENU LABEL Boot Apricity OS (x86_64) +MENU LABEL Boot Condres OS (x86_64) LINUX boot/x86_64/vmlinuz INITRD boot/x86_64/archiso.img APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% quiet splash